comparison src/exiv2.cc @ 506:fc9c8a3e1a8b

Handle the newline in DEBUG_N() macro instead of adding one in each debug message string.

505:60f75a9799b2

		g_free(pathl);
//		g_assert (image.get() != 0);
		image->readMetadata();

#if EXIV2_TEST_VERSION(0,16,0)
		DEBUG_2("xmp count %li\n", image->xmpData().count());
		if (sidecar_path && image->xmpData().empty())
			{
			gchar *sidecar_pathl = path_from_utf8(sidecar_path);
			sidecar = Exiv2::ImageFactory::open(sidecar_pathl);
			g_free(sidecar_pathl);
			sidecar->readMetadata();
			have_sidecar = sidecar->good();
			DEBUG_2("sidecar xmp count %li\n", sidecar->xmpData().count());
			}

#endif
#if EXIV2_TEST_VERSION(0,14,0)
		if (image->mimeType() == std::string("image/jpeg"))

extern "C" {

ExifData *exif_read(gchar *path, gchar *sidecar_path)
{
	DEBUG_1("exif read %s,  sidecar: %s\n", path, sidecar_path ? sidecar_path : "-");
	try {
		return new ExifData(path, sidecar_path);
	}
	catch (Exiv2::AnyError& e) {
		std::cout << "Caught Exiv2 exception '" << e << "'\n";

	if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return 0;

	try {
		RawFile rf(fd);
		offset = rf.preview_offset();
		DEBUG_1("%s: offset %lu\n", path, offset);
	}
	catch (Exiv2::AnyError& e) {
		std::cout << "Caught Exiv2 exception '" << e << "'\n";
		return 0;
	}

506:fc9c8a3e1a8b

		g_free(pathl);
//		g_assert (image.get() != 0);
		image->readMetadata();

#if EXIV2_TEST_VERSION(0,16,0)
		DEBUG_2("xmp count %li", image->xmpData().count());
		if (sidecar_path && image->xmpData().empty())
			{
			gchar *sidecar_pathl = path_from_utf8(sidecar_path);
			sidecar = Exiv2::ImageFactory::open(sidecar_pathl);
			g_free(sidecar_pathl);
			sidecar->readMetadata();
			have_sidecar = sidecar->good();
			DEBUG_2("sidecar xmp count %li", sidecar->xmpData().count());
			}

#endif
#if EXIV2_TEST_VERSION(0,14,0)
		if (image->mimeType() == std::string("image/jpeg"))

extern "C" {

ExifData *exif_read(gchar *path, gchar *sidecar_path)
{
	DEBUG_1("exif read %s, sidecar: %s", path, sidecar_path ? sidecar_path : "-");
	try {
		return new ExifData(path, sidecar_path);
	}
	catch (Exiv2::AnyError& e) {
		std::cout << "Caught Exiv2 exception '" << e << "'\n";

	if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return 0;

	try {
		RawFile rf(fd);
		offset = rf.preview_offset();
		DEBUG_1("%s: offset %lu", path, offset);
	}
	catch (Exiv2::AnyError& e) {
		std::cout << "Caught Exiv2 exception '" << e << "'\n";
		return 0;
	}