Changeset 11588

Timestamp:

07/07/08 16:29:04 (8 weeks ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• coders/dcm.c (modified) (6 diffs)
• magick/nt-base.h (modified) (1 diff)

ImageMagick/trunk/coders/dcm.c

@@ -2739 +2739 @@
     bytes_per_pixel,
     datum,
-    depth,
     height,
     high_bit,
@@ -2805 +2804 @@
   height=0;
   max_value=255UL;
-  depth=8UL;
+  image->=8UL;
   mask=0xffff;
   number_scenes=1;
@@ -3061 +3060 @@
             if (datum > 8)
               bytes_per_pixel=2;
-            depth=bits_allocated;
-            if (depth > 32)
+            image->depth=bits_allocated;
+            if (image->depth > 32)
               ThrowReaderException(CorruptImageError,"ImproperImageHeader");
             max_value=(1UL << bits_allocated)-1;
@@ -3076 +3075 @@
             if (significant_bits > 8)
               bytes_per_pixel=2;
-            depth=significant_bits;
-            if (depth > 32)
+            image->depth=significant_bits;
+            if (image->depth > 32)
               ThrowReaderException(CorruptImageError,"ImproperImageHeader");
             max_value=(1UL << significant_bits)-1;
@@ -3341 +3340 @@
     }
   scale=(Quantum *) NULL;
-  if (depth != (1UL*MAGICKCORE_QUANTUM_DEPTH))
+  if (image->depth != (1UL*MAGICKCORE_QUANTUM_DEPTH))
     {
       QuantumAny
@@ -3352 +3351 @@
         Compute pixel scaling table.
       */
-      length=(size_t) (GetQuantumRange(depth)+1);
+      length=(size_t) (GetQuantumRange(image->depth)+1);
       scale=(Quantum *) AcquireQuantumMemory(length,sizeof(*scale));
       if (scale == (Quantum *) NULL)
         ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
-      quantum_scale=GetQuantumScale(depth);
-      for (i=0; i < (long) (GetQuantumRange(depth)+1); i++)
-        scale[i]=ScaleAnyToQuantum((unsigned long) i,depth,quantum_scale);
+      quantum_scale=GetQuantumScale(image->depth);
+      for (i=0; i < (long) (GetQuantumRange(image->depth)+1); i++)
+        scale[i]=ScaleAnyToQuantum((unsigned long) i,image->depth,
+          quantum_scale);
     }
   msb_first=strcmp(transfer_syntax,"1.2.840.10008.1.2.2") == 0 ? MagickTrue :

ImageMagick/trunk/magick/nt-base.h

@@ -82 +82 @@
 #if !defined(fileno)
 #  define fileno  _fileno
+#endif
+#if !defined(fsync)
+#  define fsync  _commit
 #endif
 #if !defined(ftruncate)