[Pkg-kde-commits] rev 2133 - in trunk/packages/qt-x11-free/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-11-01 18:07:03 +0000 (Tue, 01 Nov 2005)
New Revision: 2133

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/patches/28_png-gamma-fix.dpatch
Log:
The Charles Samuel patch caused crashes, so I've replaced it (and the
original qt-copy patch) with a much simpler solution that seems to work
just as well, but doesn't crash.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-10-31 13:02:03 UTC (rev 2132)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-11-01 18:07:03 UTC (rev 2133)
@@ -2,7 +2,8 @@
 
   +++ Changes by Christopher Martin:
 
-  * Replace qt-copy's gamma patch with an improved patch from Charles Samuels.
+  * Replace qt-copy's gamma patch with a simplified patch that seems to
+    resolve the original problem in a nicer way.
     (Closes: #333542)
 
   * Build the InterBase plugin on amd64, now that firebird2 builds there.

Modified: trunk/packages/qt-x11-free/debian/patches/28_png-gamma-fix.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/28_png-gamma-fix.dpatch	2005-10-31 13:02:03 UTC (rev 2132)
+++ trunk/packages/qt-x11-free/debian/patches/28_png-gamma-fix.dpatch	2005-11-01 18:07:03 UTC (rev 2133)
@@ -19,35 +19,6 @@
 exit 0
 
 @DPATCH@
---- qt.orig/src/kernel/qpngio.cpp
-+++ qt.patched/src/kernel/qpngio.cpp
-@@ -110,12 +110,20 @@
- static
- void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float screen_gamma=0.0 )
- {
--    if ( screen_gamma != 0.0 && png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA) ) {
--	double file_gamma;
--	png_get_gAMA(png_ptr, info_ptr, &file_gamma);
--	png_set_gamma( png_ptr, screen_gamma, file_gamma );
--    }
--
-+    if ( screen_gamma  < 0.0 )
-+	// PNG docs say this is a good guess for a PC monitor
-+        // in a dark room
-+	screen_gamma = 2.2;
-+    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA) ) {
-+	// the file has a gAMA attribute
-+ 	double file_gamma;
-+	if ( png_get_gAMA(png_ptr, info_ptr, &file_gamma))
-+	    png_set_gamma( png_ptr, screen_gamma, file_gamma );
-+    } else {
-+	// no file gamma, use a reasonable default
-+	png_set_gamma( png_ptr, screen_gamma, 0.0 ); 
-+     }
-+    
-     png_uint_32 width;
-     png_uint_32 height;
-     int bit_depth;
 --- qt.orig/src/kernel/qimage.cpp
 +++ qt.patched/src/kernel/qimage.cpp
 @@ -3783,7 +3783,7 @@
@@ -55,18 +26,7 @@
      d->parameters = 0;
      d->quality = -1; // default quality of the current format
 -    d->gamma=0.0f;
-+    d->gamma=-1.0f;
++    d->gamma=2.2f;
      iostat = 0;
      iodev  = 0;
  }
-@@ -4187,7 +4187,9 @@
-     modify the image. Setting to 0.0 will disable gamma correction
-     (i.e. any specification in the file will be ignored).
- 
--    The default value is 0.0.
-+    Setting to a negative number will use reasonable defaults
-+
-+    The default value is -1.0.
- 
-     \sa gamma()
- */