Attachment #243155 for bug #272311

View | Details | Raw Unified | Return to bug 272311 | Differences between

and this patch

Lines 1-6 Link Here

(-)b/graphics/rawstudio/Makefile (-1 / +1 lines)
1	PORTNAME= rawstudio	1	PORTNAME= rawstudio
2	PORTVERSION= 2.0	2	PORTVERSION= 2.0
3	PORTREVISION= 23	3	PORTREVISION= 24
4	CATEGORIES= graphics	4	CATEGORIES= graphics
5	MASTER_SITES= http://rawstudio.org/files/release/	5	MASTER_SITES= http://rawstudio.org/files/release/
6		6




 #include "rs-exif.h"
 #include <assert.h>
 #include "rs-library.h"
@@ -128,7 +130,7 @@ rs_exif_load_from_file(const gchar *filename)
 	RS_EXIF_DATA *exif_data;
 	try
 	{
-		Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
+		Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(filename) };
 		assert(image.get() != 0);
 		image->readMetadata();
 
@@ -136,7 +138,7 @@ rs_exif_load_from_file(const gchar *filename)
 
 		exif_data_init(exif_data);
 	}
-	catch (Exiv2::AnyError& e)
+	catch (Exiv2::Error& e)
 	{
 		g_warning("Could not load EXIF data from file %s", filename);
 		return NULL;
@@ -151,8 +153,8 @@ rs_exif_load_from_rawfile(RAWFILE *rawfile)
 	RS_EXIF_DATA *rs_exif_data;
 	try
 	{
-		Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(
-			(const Exiv2::byte*) raw_get_map(rawfile), raw_get_filesize(rawfile));
+		Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(
+			(const Exiv2::byte*) raw_get_map(rawfile), raw_get_filesize(rawfile)) };
 
 		assert(image.get() != 0);
 		image->readMetadata();
@@ -161,7 +163,7 @@ rs_exif_load_from_rawfile(RAWFILE *rawfile)
 
 		exif_data_init(rs_exif_data);
 	}
-	catch (Exiv2::AnyError& e)
+	catch (Exiv2::Error& e)
 	{
 		g_warning("Could not load EXIF data");
 		return NULL;
@@ -179,7 +181,7 @@ rs_exif_add_to_file(RS_EXIF_DATA *d, Exiv2::IptcData &
 	try
 	{
 		Exiv2::ExifData *data = (Exiv2::ExifData *) d;
-		Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
+		Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(filename) };
 
 		/* Copy EXIF to XMP */
 #if EXIV2_TEST_VERSION(0,17,0)
@@ -194,7 +196,7 @@ rs_exif_add_to_file(RS_EXIF_DATA *d, Exiv2::IptcData &
 		image->setIptcData(iptc_data);
 		image->writeMetadata();
 	}
-	catch (Exiv2::AnyError& e)
+	catch (Exiv2::Error& e)
 	{
 		g_warning("Couldn't add EXIF data to %s", filename);
 	}
@@ -263,7 +265,7 @@ rs_add_tags_exif(RS_EXIF_DATA *d, const gchar *input_f
 
 	glong items_written;
 	gunichar2 *w = g_utf8_to_utf16(xpkeyw->str, -1, NULL, &items_written, NULL);
-	Exiv2::Value::AutoPtr v = Exiv2::Value::create(Exiv2::unsignedByte);
+	Exiv2::Value::UniquePtr v { Exiv2::Value::create(Exiv2::unsignedByte) };
 	v->read((const Exiv2::byte*)w, items_written * sizeof(gunichar2), Exiv2::invalidByteOrder);
 	Exiv2::ExifKey key = Exiv2::ExifKey("Exif.Image.XPKeywords");
 	data->add(key, v.get());




 						if (retval != 0)
 						{
 							RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
@@ -151,7 +153,7 @@ jpeg_fail:
 #endif
 
 	try {
-		Image::AutoPtr img = ImageFactory::open(filename);
+		Image::UniquePtr img { ImageFactory::open(filename) };
 		img->readMetadata();
 		ExifData &exifData = img->exifData();
 		*linear_guess = FALSE;
@@ -169,13 +171,13 @@ jpeg_fail:
 			ExifData::const_iterator i;
 			i = exifData.findKey(ExifKey("Exif.Image.BitsPerSample"));
 			if (i != exifData.end())
-				if (i->toLong() == 16)
+				if (i->toInt64() == 16)
 					*linear_guess = TRUE;
 			
 			i = exifData.findKey(ExifKey("Exif.Photo.ColorSpace"));
 			if (i != exifData.end())
 			{
-				if (i->toLong() == 1)
+				if (i->toInt64() == 1)
 					return rs_color_space_new_singleton("RSSrgb");
 			}
 
@@ -184,10 +186,10 @@ jpeg_fail:
 			if (i != exifData.end())
 			{
 				DataBuf buf(i->size());
-				i->copy(buf.pData_, Exiv2::invalidByteOrder);
-				if (buf.pData_ && buf.size_)
+				i->copy(buf.data(), Exiv2::invalidByteOrder);
+				if (buf.c_data() && buf.size())
 				{
-					RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)buf.pData_, buf.size_, TRUE);
+					RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)buf.c_data(), buf.size(), TRUE);
 					return rs_color_space_icc_new_from_icc(icc);
 				}
 			}




 #include <assert.h>
 #include "exiv2-metadata.h"
 #include <math.h>
@@ -94,7 +96,7 @@ gboolean
 exiv2_load_meta_interface(const gchar *service, RAWFILE *rawfile, guint offset, RSMetadata *meta)
 {
 	try {
-		Image::AutoPtr img = ImageFactory::open((byte*)raw_get_map(rawfile), raw_get_filesize(rawfile));
+		Image::UniquePtr img { ImageFactory::open((byte*)raw_get_map(rawfile), raw_get_filesize(rawfile)) };
 		img->readMetadata();
 		ExifData &exifData = img->exifData();
 
@@ -121,7 +123,7 @@ exiv2_load_meta_interface(const gchar *service, RAWFIL
 			i = orientation(exifData);
 			if (i != exifData.end())
 			{
-				switch (i->getValue()->toLong())
+				switch (i->getValue()->toInt64())
 				{
 						case 6: meta->orientation = 90;
 							break;
@@ -173,7 +175,7 @@ exiv2_load_meta_interface(const gchar *service, RAWFIL
 #if EXIV2_TEST_VERSION(0,19,0)
 			i = isoSpeed(exifData);
 			if (i != exifData.end())
-				meta->iso = i->toLong();
+				meta->iso = i->toInt64();
 
 			/* Text based Lens Identifier */
 			i = lensName(exifData);
@@ -181,7 +183,7 @@ exiv2_load_meta_interface(const gchar *service, RAWFIL
 			{
 				TypeId type = i->typeId();
 				if (type == unsignedShort || type == unsignedLong || type == signedShort || type == signedLong || type == unsignedByte || type == signedByte)
-					meta->lens_id = i->toLong();
+					meta->lens_id = i->toInt64();
 				else if (type == asciiString || type == string)
 					meta->fixed_lens_identifier = g_strdup(i->toString().c_str());
 			}
@@ -223,7 +225,7 @@ exiv2_load_meta_interface(const gchar *service, RAWFIL
 			if (i == exifData.end())
 				i = exifData.findKey(ExifKey("Exif.NikonLd3.MinFocalLength"));
 			if (i != exifData.end())
-				meta->lens_min_focal = 5.0 * pow(2.0, i->toLong()/24.0);
+				meta->lens_min_focal = 5.0 * pow(2.0, i->toInt64()/24.0);
 
 			i = exifData.findKey(ExifKey("Exif.NikonLd1.MaxFocalLength"));
 			if (i == exifData.end())
@@ -231,7 +233,7 @@ exiv2_load_meta_interface(const gchar *service, RAWFIL
 			if (i == exifData.end())
 				i = exifData.findKey(ExifKey("Exif.NikonLd3.MaxFocalLength"));
 			if (i != exifData.end())
-				meta->lens_max_focal = 5.0 * pow(2.0, i->toLong()/24.0);
+				meta->lens_max_focal = 5.0 * pow(2.0, i->toInt64()/24.0);
 
 			i = exifData.findKey(ExifKey("Exif.NikonLd1.MaxApertureAtMinFocal"));
 			if (i == exifData.end())
@@ -239,7 +241,7 @@ exiv2_load_meta_interface(const gchar *service, RAWFIL
 			if (i == exifData.end())
 				i = exifData.findKey(ExifKey("Exif.NikonLd3.MaxApertureAtMinFocal"));
 			if (i != exifData.end())
-				meta->lens_min_aperture = i->toLong()/12.0;
+				meta->lens_min_aperture = i->toInt64()/12.0;
 			
 			i = exifData.findKey(ExifKey("Exif.NikonLd1.MaxApertureAtMaxFocal"));
 			if (i == exifData.end())
@@ -247,7 +249,7 @@ exiv2_load_meta_interface(const gchar *service, RAWFIL
 			if (i == exifData.end())
 				i = exifData.findKey(ExifKey("Exif.NikonLd3.MaxApertureAtMaxFocal"));
 			if (i != exifData.end())
-				meta->lens_max_aperture = i->toLong()/12.0;
+				meta->lens_max_aperture = i->toInt64()/12.0;
 				
 			/* Fuji */
 			i = exifData.findKey(ExifKey("Exif.Fujifilm.MinFocalLength"));

Return to bug 272311

Lines 9-11 Link Here

(-)b/graphics/rawstudio/files/patch-librawstudio_rs-exif.cc (+65 lines)
9	#include "rs-exif.h"	9	#include "rs-exif.h"
10	#include <assert.h>	10	#include <assert.h>
11	#include "rs-library.h"	11	#include "rs-library.h"
		12	@@ -128,7 +130,7 @@ rs_exif_load_from_file(const gchar *filename)
		13	RS_EXIF_DATA *exif_data;
		14	try
		15	{
		16	- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
		17	+ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(filename) };
		18	assert(image.get() != 0);
		19	image->readMetadata();
		20
		21	@@ -136,7 +138,7 @@ rs_exif_load_from_file(const gchar *filename)
		22
		23	exif_data_init(exif_data);
		24	}
		25	- catch (Exiv2::AnyError& e)
		26	+ catch (Exiv2::Error& e)
		27	{
		28	g_warning("Could not load EXIF data from file %s", filename);
		29	return NULL;
		30	@@ -151,8 +153,8 @@ rs_exif_load_from_rawfile(RAWFILE *rawfile)
		31	RS_EXIF_DATA *rs_exif_data;
		32	try
		33	{
		34	- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(
		35	- (const Exiv2::byte*) raw_get_map(rawfile), raw_get_filesize(rawfile));
		36	+ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(
		37	+ (const Exiv2::byte*) raw_get_map(rawfile), raw_get_filesize(rawfile)) };
		38
		39	assert(image.get() != 0);
		40	image->readMetadata();
		41	@@ -161,7 +163,7 @@ rs_exif_load_from_rawfile(RAWFILE *rawfile)
		42
		43	exif_data_init(rs_exif_data);
		44	}
		45	- catch (Exiv2::AnyError& e)
		46	+ catch (Exiv2::Error& e)
		47	{
		48	g_warning("Could not load EXIF data");
		49	return NULL;
		50	@@ -179,7 +181,7 @@ rs_exif_add_to_file(RS_EXIF_DATA *d, Exiv2::IptcData &
		51	try
		52	{
		53	Exiv2::ExifData data = (Exiv2::ExifData ) d;
		54	- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
		55	+ Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(filename) };
		56
		57	/* Copy EXIF to XMP */
		58	#if EXIV2_TEST_VERSION(0,17,0)
		59	@@ -194,7 +196,7 @@ rs_exif_add_to_file(RS_EXIF_DATA *d, Exiv2::IptcData &
		60	image->setIptcData(iptc_data);
		61	image->writeMetadata();
		62	}
		63	- catch (Exiv2::AnyError& e)
		64	+ catch (Exiv2::Error& e)
		65	{
		66	g_warning("Couldn't add EXIF data to %s", filename);
		67	}
		68	@@ -263,7 +265,7 @@ rs_add_tags_exif(RS_EXIF_DATA d, const gchar input_f
		69
		70	glong items_written;
		71	gunichar2 *w = g_utf8_to_utf16(xpkeyw->str, -1, NULL, &items_written, NULL);
		72	- Exiv2::Value::AutoPtr v = Exiv2::Value::create(Exiv2::unsignedByte);
		73	+ Exiv2::Value::UniquePtr v { Exiv2::Value::create(Exiv2::unsignedByte) };
		74	v->read((const Exiv2::byte)w, items_written sizeof(gunichar2), Exiv2::invalidByteOrder);
		75	Exiv2::ExifKey key = Exiv2::ExifKey("Exif.Image.XPKeywords");
76	data->add(key, v.get());

Lines 23-25 Link Here

(-)b/graphics/rawstudio/files/patch-plugins_load-gdk_exiv2-colorspace.cpp (+39 lines)
23	if (retval != 0)	23	if (retval != 0)
24	{	24	{
25	RSIccProfile icc = rs_icc_profile_new_from_memory((gchar)icc_profile, icc_profile_size, TRUE);	25	RSIccProfile icc = rs_icc_profile_new_from_memory((gchar)icc_profile, icc_profile_size, TRUE);
		26	@@ -151,7 +153,7 @@ jpeg_fail:
		27	#endif
		28
		29	try {
		30	- Image::AutoPtr img = ImageFactory::open(filename);
		31	+ Image::UniquePtr img { ImageFactory::open(filename) };
		32	img->readMetadata();
		33	ExifData &exifData = img->exifData();
		34	*linear_guess = FALSE;
		35	@@ -169,13 +171,13 @@ jpeg_fail:
		36	ExifData::const_iterator i;
		37	i = exifData.findKey(ExifKey("Exif.Image.BitsPerSample"));
		38	if (i != exifData.end())
		39	- if (i->toLong() == 16)
		40	+ if (i->toInt64() == 16)
		41	*linear_guess = TRUE;
		42
		43	i = exifData.findKey(ExifKey("Exif.Photo.ColorSpace"));
		44	if (i != exifData.end())
		45	{
		46	- if (i->toLong() == 1)
		47	+ if (i->toInt64() == 1)
		48	return rs_color_space_new_singleton("RSSrgb");
		49	}
		50
		51	@@ -184,10 +186,10 @@ jpeg_fail:
		52	if (i != exifData.end())
		53	{
		54	DataBuf buf(i->size());
		55	- i->copy(buf.pData_, Exiv2::invalidByteOrder);
		56	- if (buf.pData_ && buf.size_)
		57	+ i->copy(buf.data(), Exiv2::invalidByteOrder);
		58	+ if (buf.c_data() && buf.size())
		59	{
		60	- RSIccProfile icc = rs_icc_profile_new_from_memory((gchar)buf.pData_, buf.size_, TRUE);
		61	+ RSIccProfile icc = rs_icc_profile_new_from_memory((gchar)buf.c_data(), buf.size(), TRUE);
		62	return rs_color_space_icc_new_from_icc(icc);
		63	}
		64	}