diff --git a/ImageMagick.spec b/ImageMagick.spec
index fe16aee..86af5cd 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
%global VERSION 6.6.5
-%global Patchlevel 7
+%global Patchlevel 6
Name: ImageMagick
Version: %{VERSION}
diff --git a/coders/pnm.c b/coders/pnm.c
index 56a69ae..efb7711 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -555,8 +555,8 @@
{
pixel.red=(MagickRealType) scale[ConstrainPixel(image,(ssize_t)
pixel.red,max_value)];
- pixel.green=(MagickRealType) scale[ConstrainPixel(image,(ssize_t)
- pixel.green,max_value)];
+ pixel.green=(MagickRealType) scale[ConstrainPixel(image,
+ (ssize_t) pixel.green,max_value)];
pixel.blue=(MagickRealType) scale[ConstrainPixel(image,(ssize_t)
pixel.blue,max_value)];
}
@@ -700,8 +700,8 @@
MagickBooleanType
proceed;
- proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row,
- image->rows);
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
@@ -810,8 +810,8 @@
MagickBooleanType
proceed;
- proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row,
- image->rows);
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
@@ -990,8 +990,8 @@
MagickBooleanType
proceed;
- proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row,
- image->rows);
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
@@ -1031,7 +1031,8 @@
if (image->matte != MagickFalse)
{
p=PushCharPixel(p,&pixel);
- SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+ range));
}
q++;
}
@@ -1051,7 +1052,8 @@
if (image->matte != MagickFalse)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+ range));
}
q++;
}
@@ -1080,7 +1082,8 @@
if (image->matte != MagickFalse)
{
p=PushCharPixel(p,&pixel);
- SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+ range));
}
q++;
}
@@ -1104,7 +1107,8 @@
if (image->matte != MagickFalse)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+ range));
}
q++;
}
@@ -1130,7 +1134,8 @@
if (image->matte != MagickFalse)
{
p=PushCharPixel(p,&pixel);
- SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+ range));
}
q++;
}
@@ -1152,7 +1157,8 @@
if (image->matte != MagickFalse)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,
+ range));
}
q++;
}
@@ -1222,8 +1228,8 @@
MagickBooleanType
proceed;
- proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row,
- image->rows);
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType)
+ row,image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
diff --git a/config/configure.xml b/config/configure.xml
index c9c193c..1428996 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,7 +8,7 @@
<configuremap>
<configure name="NAME" value="ImageMagick"/>
<configure name="LIB_VERSION" value="0x665"/>
- <configure name="LIB_VERSION_NUMBER" value="6,6,5,7"/>
+ <configure name="LIB_VERSION_NUMBER" value="6,6,5,6"/>
<configure name="RELEASE_DATE" value="2010-11-06"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
diff --git a/libtool b/libtool
index 62fe88f..67d8d9a 100755
--- a/libtool
+++ b/libtool
@@ -1,7 +1,7 @@
#! /bin/sh
# libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.6.5-7
+# Generated automatically by config.status (ImageMagick) 6.6.5-6
# Libtool was configured on host magick.imagemagick.org:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
diff --git a/magick/magic.c b/magick/magic.c
index 4b9c240..d57e0ce 100644
--- a/magick/magic.c
+++ b/magick/magic.c
@@ -152,15 +152,15 @@
{ "PGX", 0, MagickString("\050\107\020\115\046") },
{ "PICT", 522, MagickString("\000\021\002\377\014\000") },
{ "PNG", 0, MagickString("\211PNG\r\n\032\n") },
- { "PNM", 0, MagickString("P1") },
- { "PNM", 0, MagickString("P2") },
- { "PNM", 0, MagickString("P3") },
- { "PNM", 0, MagickString("P4") },
- { "PNM", 0, MagickString("P5") },
- { "PNM", 0, MagickString("P6") },
- { "PNM", 0, MagickString("P7") },
- { "PNM", 0, MagickString("PF") },
- { "PNM", 0, MagickString("Pf") },
+ { "PBM", 0, MagickString("P1") },
+ { "PGM", 0, MagickString("P2") },
+ { "PPM", 0, MagickString("P3") },
+ { "PBM", 0, MagickString("P4") },
+ { "PGM", 0, MagickString("P5") },
+ { "PPM", 0, MagickString("P6") },
+ { "PAM", 0, MagickString("P7") },
+ { "PFM", 0, MagickString("PF") },
+ { "PFM", 0, MagickString("Pf") },
{ "PS", 0, MagickString("%!") },
{ "PS", 0, MagickString("\004%!") },
{ "PS", 0, MagickString("\305\320\323\306") },
diff --git a/magick/version.h b/magick/version.h
index 3378ad5..30dcf3f 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@
#define MagickLibVersion 0x665
#define MagickLibVersionText "6.6.5"
#define MagickLibVersionNumber 4,0,0
-#define MagickLibAddendum "-7"
+#define MagickLibAddendum "-6"
#define MagickLibInterface 4
#define MagickLibMinInterface 4
#define MagickReleaseDate "2010-11-06"
diff --git a/version.sh b/version.sh
index fdcf0d0..e7c54af 100644
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@
# PACKAGE_NAME (e.g. "1.0.0").
PACKAGE_VERSION='6.6.5'
PACKAGE_LIB_VERSION="0x665"
-PACKAGE_RELEASE="7"
+PACKAGE_RELEASE="6"
PACKAGE_LIB_VERSION_NUMBER="6,6,5,${PACKAGE_RELEASE}"
PACKAGE_RELEASE_DATE=`date +%F`
PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"