diff --git a/Makefile b/Makefile index cd71b2b..a4889be 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,12 @@ LDFLAGS = `Magick++-config --ldflags` $(BOOST_LIBS) -lpthread SOURCES = DescriptorManager.cpp main.cpp OBJECTS = $(SOURCES:.cpp=.o) -EXECUTABLE = small-image-descriptors +all: small-image-descriptors filename -$(EXECUTABLE): $(OBJECTS) +small-image-descriptors: $(OBJECTS) $(CXX) -o $@ $(OBJECTS) $(LDFLAGS) +filename: filename.cpp + $(CXX) $(CPPFLAGS) -o filename filename.cpp $(LDFLAGS) .PHONY: clean clean: - rm $(EXEC) $(OBJECTS) + rm small-image-descriptors filename $(OBJECTS) diff --git a/filename.cpp b/filename.cpp new file mode 100755 index 0000000..a281303 --- /dev/null +++ b/filename.cpp @@ -0,0 +1,31 @@ +#include +#include +#include +#include +#include +#include +#include +#include "Descriptor.h" + +using namespace Magick; + +int main(int argc, char **argv) { + std::string filename; + if (argc > 1) { + filename = argv[1]; + } + else { + std::cout << "Usage: " << std::endl << argv[0] << " filename" << std::endl; + std::cout << "Continuing.." << std::endl; + } + Descriptor* d = new DCTMedian(); + InitializeMagick(*argv); + Image* img = new Image(filename); + uint64_t result = d->feature(img); + std::cout << std::hex << result; + if (argc > 2) { + std::cout << std::endl << std::dec << result; + std::cout << std::endl << bitset<64>(result).to_string() << std::endl; + } + return 0; +}