Attachment #243160 for bug #272311

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

and this patch

Lines 1-6 Link Here

(-)b/graphics/lux/Makefile (-1 / +1 lines)
1	PORTNAME= lux	1	PORTNAME= lux
2	PORTVERSION= 1.1.6	2	PORTVERSION= 1.1.6
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= graphics	4	CATEGORIES= graphics
5	MASTER_SITES= https://bitbucket.org/kfj/pv/get/	5	MASTER_SITES= https://bitbucket.org/kfj/pv/get/
6	PKGNAMESUFFIX= -pv # distinguish from www/lux	6	PKGNAMESUFFIX= -pv # distinguish from www/lux




--- pv_metadata.h.orig	2023-03-27 07:19:09 UTC
+++ pv_metadata.h
@@ -234,7 +234,7 @@ struct metadata_type
       std::cout << result->key() << ": "
                 << result->value() << std::endl ;
 
-      _result = result->value().toLong() ;
+      _result = result->value().toInt64() ;
       return true ;
     }
     return false ;
@@ -665,7 +665,7 @@ struct metadata_type
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              lux_uncropped_width = result->value().toLong() ;
+              lux_uncropped_width = result->value().toInt64() ;
             }
 
             lux_uncropped_height = -1 ;
@@ -673,7 +673,7 @@ struct metadata_type
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              lux_uncropped_height = result->value().toLong() ;
+              lux_uncropped_height = result->value().toInt64() ;
             }
 
             lux_cropping_active = false ;
@@ -681,7 +681,7 @@ struct metadata_type
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              lux_cropping_active = result->value().toLong() ;
+              lux_cropping_active = result->value().toInt64() ;
             }
 
             lux_cropped_width = -1 ;
@@ -689,7 +689,7 @@ struct metadata_type
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              lux_cropped_width = result->value().toLong() ;
+              lux_cropped_width = result->value().toInt64() ;
             }
 
             lux_cropped_height = -1 ;
@@ -697,7 +697,7 @@ struct metadata_type
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              lux_cropped_height = result->value().toLong() ;
+              lux_cropped_height = result->value().toInt64() ;
             }
 
             lux_crop_x0 = -1 ;
@@ -705,7 +705,7 @@ struct metadata_type
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              lux_crop_x0 = result->value().toLong() ;
+              lux_crop_x0 = result->value().toInt64() ;
             }
 
             lux_crop_y0 = -1 ;
@@ -713,7 +713,7 @@ struct metadata_type
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              lux_crop_y0 = result->value().toLong() ;
+              lux_crop_y0 = result->value().toInt64() ;
             }
 
             lux_crop_x1 = -1 ;
@@ -721,7 +721,7 @@ struct metadata_type
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              lux_crop_x1 = result->value().toLong() ;
+              lux_crop_x1 = result->value().toInt64() ;
             }
 
             lux_crop_y1 = -1 ;
@@ -729,7 +729,7 @@ struct metadata_type
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              lux_crop_y1 = result->value().toLong() ;
+              lux_crop_y1 = result->value().toInt64() ;
             }
 
             if ( lux_cropping_active )
@@ -790,42 +790,42 @@ struct metadata_type
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              FullPanoHeightPixels = result->value().toLong() ;
+              FullPanoHeightPixels = result->value().toInt64() ;
             }
 
             key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.FullPanoWidthPixels" ) ) ;
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              FullPanoWidthPixels = result->value().toLong() ;
+              FullPanoWidthPixels = result->value().toInt64() ;
             }
 
             key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaImageHeightPixels" ) ) ;
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              CroppedAreaImageHeightPixels = result->value().toLong() ;
+              CroppedAreaImageHeightPixels = result->value().toInt64() ;
             }
 
             key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaImageWidthPixels" ) ) ;
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              CroppedAreaImageWidthPixels = result->value().toLong() ;
+              CroppedAreaImageWidthPixels = result->value().toInt64() ;
             }
 
             key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaLeftPixels" ) ) ;
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              CroppedAreaLeftPixels = result->value().toLong() ;
+              CroppedAreaLeftPixels = result->value().toInt64() ;
             }
 
             key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaTopPixels" ) ) ;
             result = xmpData.findKey ( key ) ;
             if ( result != xmpData.end() )
             {
-              CroppedAreaTopPixels = result->value().toLong() ;
+              CroppedAreaTopPixels = result->value().toInt64() ;
             }
 
             // currently we only process GPano data if projection is equirectangular

Added Link Here

(-)b/graphics/lux/files/patch-pv__no__rendering.cc (-1 / +11 lines)
0	-	1	--- pv_no_rendering.cc.orig 2023-03-27 07:19:09 UTC
		2	+++ pv_no_rendering.cc
		3	@@ -8828,7 +8828,7 @@ void store_rendered_image ( const job_type * p_job ,
		4
		5	image->writeMetadata();
		6	}
		7	- catch ( Exiv2::AnyError& e )
		8	+ catch ( Exiv2::Error& e )
		9	{
		10	std::cerr << "Caught Exiv2 exception '"
		11	<< e << "'\n" ;

Return to bug 272311

Added Link Here

(-)b/graphics/lux/files/patch-pv__metadata.h (+141 lines)
1	--- pv_metadata.h.orig 2023-03-27 07:19:09 UTC
2	+++ pv_metadata.h
3	@@ -234,7 +234,7 @@ struct metadata_type
4	std::cout << result->key() << ": "
5	<< result->value() << std::endl ;
6
7	- _result = result->value().toLong() ;
8	+ _result = result->value().toInt64() ;
9	return true ;
10	}
11	return false ;
12	@@ -665,7 +665,7 @@ struct metadata_type
13	result = xmpData.findKey ( key ) ;
14	if ( result != xmpData.end() )
15	{
16	- lux_uncropped_width = result->value().toLong() ;
17	+ lux_uncropped_width = result->value().toInt64() ;
18	}
19
20	lux_uncropped_height = -1 ;
21	@@ -673,7 +673,7 @@ struct metadata_type
22	result = xmpData.findKey ( key ) ;
23	if ( result != xmpData.end() )
24	{
25	- lux_uncropped_height = result->value().toLong() ;
26	+ lux_uncropped_height = result->value().toInt64() ;
27	}
28
29	lux_cropping_active = false ;
30	@@ -681,7 +681,7 @@ struct metadata_type
31	result = xmpData.findKey ( key ) ;
32	if ( result != xmpData.end() )
33	{
34	- lux_cropping_active = result->value().toLong() ;
35	+ lux_cropping_active = result->value().toInt64() ;
36	}
37
38	lux_cropped_width = -1 ;
39	@@ -689,7 +689,7 @@ struct metadata_type
40	result = xmpData.findKey ( key ) ;
41	if ( result != xmpData.end() )
42	{
43	- lux_cropped_width = result->value().toLong() ;
44	+ lux_cropped_width = result->value().toInt64() ;
45	}
46
47	lux_cropped_height = -1 ;
48	@@ -697,7 +697,7 @@ struct metadata_type
49	result = xmpData.findKey ( key ) ;
50	if ( result != xmpData.end() )
51	{
52	- lux_cropped_height = result->value().toLong() ;
53	+ lux_cropped_height = result->value().toInt64() ;
54	}
55
56	lux_crop_x0 = -1 ;
57	@@ -705,7 +705,7 @@ struct metadata_type
58	result = xmpData.findKey ( key ) ;
59	if ( result != xmpData.end() )
60	{
61	- lux_crop_x0 = result->value().toLong() ;
62	+ lux_crop_x0 = result->value().toInt64() ;
63	}
64
65	lux_crop_y0 = -1 ;
66	@@ -713,7 +713,7 @@ struct metadata_type
67	result = xmpData.findKey ( key ) ;
68	if ( result != xmpData.end() )
69	{
70	- lux_crop_y0 = result->value().toLong() ;
71	+ lux_crop_y0 = result->value().toInt64() ;
72	}
73
74	lux_crop_x1 = -1 ;
75	@@ -721,7 +721,7 @@ struct metadata_type
76	result = xmpData.findKey ( key ) ;
77	if ( result != xmpData.end() )
78	{
79	- lux_crop_x1 = result->value().toLong() ;
80	+ lux_crop_x1 = result->value().toInt64() ;
81	}
82
83	lux_crop_y1 = -1 ;
84	@@ -729,7 +729,7 @@ struct metadata_type
85	result = xmpData.findKey ( key ) ;
86	if ( result != xmpData.end() )
87	{
88	- lux_crop_y1 = result->value().toLong() ;
89	+ lux_crop_y1 = result->value().toInt64() ;
90	}
91
92	if ( lux_cropping_active )
93	@@ -790,42 +790,42 @@ struct metadata_type
94	result = xmpData.findKey ( key ) ;
95	if ( result != xmpData.end() )
96	{
97	- FullPanoHeightPixels = result->value().toLong() ;
98	+ FullPanoHeightPixels = result->value().toInt64() ;
99	}
100
101	key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.FullPanoWidthPixels" ) ) ;
102	result = xmpData.findKey ( key ) ;
103	if ( result != xmpData.end() )
104	{
105	- FullPanoWidthPixels = result->value().toLong() ;
106	+ FullPanoWidthPixels = result->value().toInt64() ;
107	}
108
109	key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaImageHeightPixels" ) ) ;
110	result = xmpData.findKey ( key ) ;
111	if ( result != xmpData.end() )
112	{
113	- CroppedAreaImageHeightPixels = result->value().toLong() ;
114	+ CroppedAreaImageHeightPixels = result->value().toInt64() ;
115	}
116
117	key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaImageWidthPixels" ) ) ;
118	result = xmpData.findKey ( key ) ;
119	if ( result != xmpData.end() )
120	{
121	- CroppedAreaImageWidthPixels = result->value().toLong() ;
122	+ CroppedAreaImageWidthPixels = result->value().toInt64() ;
123	}
124
125	key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaLeftPixels" ) ) ;
126	result = xmpData.findKey ( key ) ;
127	if ( result != xmpData.end() )
128	{
129	- CroppedAreaLeftPixels = result->value().toLong() ;
130	+ CroppedAreaLeftPixels = result->value().toInt64() ;
131	}
132
133	key = Exiv2::XmpKey ( std::string ( "Xmp.GPano.CroppedAreaTopPixels" ) ) ;
134	result = xmpData.findKey ( key ) ;
135	if ( result != xmpData.end() )
136	{
137	- CroppedAreaTopPixels = result->value().toLong() ;
138	+ CroppedAreaTopPixels = result->value().toInt64() ;
139	}
140
141	// currently we only process GPano data if projection is equirectangular