tag 332455 patch fixed-upstream
thanks
On Thu, Oct 27, 2005 at 07:15:37PM +0200, Luk Claes wrote:
> Just rebuilding with adjusted build-dependencies does not solve this bug.
I backported the necessary changes from the current upstream version
1.9.3 and will upload this as a NMU during the current BSP:
diff -Naur librmagick-ruby-1.9.0.bak/debian/changelog
librmagick-ruby-1.9.0/debian/changelog
--- librmagick-ruby-1.9.0.bak/debian/changelog 2005-10-31 00:41:09.000000000
+0100
+++ librmagick-ruby-1.9.0/debian/changelog 2005-10-31 00:53:41.000000000
+0100
@@ -1,3 +1,11 @@
+librmagick-ruby (1.9.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update build-dependencies to libmagick9-dev (Closes: #332455)
+ (Necessary source changes backported from upstream 1.9.3)
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Mon, 31 Oct 2005 00:41:19 +0100
+
librmagick-ruby (1.9.0-1) unstable; urgency=medium
* Another new upstream version. (closes: #287140)
diff -Naur librmagick-ruby-1.9.0.bak/debian/control
librmagick-ruby-1.9.0/debian/control
--- librmagick-ruby-1.9.0.bak/debian/control 2005-10-31 00:41:09.000000000
+0100
+++ librmagick-ruby-1.9.0/debian/control 2005-10-31 00:41:53.000000000
+0100
@@ -2,7 +2,7 @@
Section: interpreters
Priority: optional
Maintainer: Mike Williams <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), imagemagick (>= 6.2.3), libmagick6-dev
(>= 6.2.3), ruby1.8, ruby1.8-dev, libwmf-bin, gs-gpl
+Build-Depends: debhelper (>> 4.0.0), imagemagick (>= 6.2.3), libmagick9-dev |
libmagick-dev, ruby1.8, ruby1.8-dev, libwmf-bin, gs-gpl
Standards-Version: 3.6.1
Package: librmagick-ruby
diff -Naur librmagick-ruby-1.9.0.bak/ext/RMagick/rmimage.c
librmagick-ruby-1.9.0/ext/RMagick/rmimage.c
--- librmagick-ruby-1.9.0.bak/ext/RMagick/rmimage.c 2005-06-19
22:26:34.000000000 +0200
+++ librmagick-ruby-1.9.0/ext/RMagick/rmimage.c 2005-10-31 00:48:01.000000000
+0100
@@ -5238,7 +5238,7 @@
HANDLE_ERROR
// PseudoClass
- if (image->class == PseudoClass)
+ if (image->storage_class == PseudoClass)
{
IndexPacket *indexes = GetIndexes(image);
old_color = image->colormap[*indexes];
@@ -5259,12 +5259,12 @@
// Set the color of a pixel. Return previous color.
// Convert to DirectClass
- if (image->class == PseudoClass)
+ if (image->storage_class == PseudoClass)
{
SyncImage(image);
magick_free(image->colormap);
image->colormap = NULL;
- image->class = DirectClass;
+ image->storage_class = DirectClass;
}
pixel = GetImagePixels(image, x, y, 1, 1);
@@ -7002,7 +7002,7 @@
Image *image;
Data_Get_Struct(self, Image, image);
- return ClassType_new(image->class);
+ return ClassType_new(image->storage_class);
}
/*
@@ -7021,20 +7021,20 @@
Data_Get_Struct(self, Image, image);
VALUE_TO_ENUM(new_class_type, class_type, ClassType);
- if (image->class == PseudoClass && class_type == DirectClass)
+ if (image->storage_class == PseudoClass && class_type == DirectClass)
{
SyncImage(image);
magick_free(image->colormap);
image->colormap = NULL;
}
- else if (image->class == DirectClass && class_type == PseudoClass)
+ else if (image->storage_class == DirectClass && class_type == PseudoClass)
{
GetQuantizeInfo(&qinfo);
qinfo.number_colors = MaxRGB+1;
QuantizeImage(&qinfo, image);
}
- image->class = class_type;
+ image->storage_class = class_type;
return self;
}
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
