[prev in list] [next in list] [prev in thread] [next in thread] 

List:       graphicsmagick-commit
Subject:    [GM-commit] GraphicsMagick: Remove private implementation details from magic...
From:       GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date:       2021-12-21 23:08:41
Message-ID: mailman.27922.1640128132.1995.graphicsmagick-commit () lists ! sourceforge ! net
[Download RAW message or body]

changeset 709540d3e246 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=709540d3e246
                
summary: Remove private implementation details from magick/signature.h

diffstat:

 ChangeLog          |   5 +++++
 magick/signature.c |  34 ++++++++++++++++++++++++++++++++--
 magick/signature.h |  28 ----------------------------
 www/Changelog.html |   9 +++++++--
 4 files changed, 44 insertions(+), 32 deletions(-)

diffs (142 lines):

diff -r 232cce2f8964 -r 709540d3e246 ChangeLog
--- a/ChangeLog	Tue Dec 21 11:23:54 2021 -0600
+++ b/ChangeLog	Tue Dec 21 17:08:37 2021 -0600
@@ -1,5 +1,10 @@
 2021-12-21  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
+        * magick/signature.c: Remove functions FinalizeSignature,
+        GetSignatureInfo, TransformSignature, UpdateSignature and other
+        private implementation details from signature.h.  Use managed
+        memory allocator.
+
         * coders/png.c (DestroyJNG): Deallocate alpha_image temporary file in \
DestroyJNG().  (ReadOnePNGImage): If setjmp fires, then don't return a broken
         image.
diff -r 232cce2f8964 -r 709540d3e246 magick/signature.c
--- a/magick/signature.c	Tue Dec 21 11:23:54 2021 -0600
+++ b/magick/signature.c	Tue Dec 21 17:08:37 2021 -0600
@@ -37,6 +37,7 @@
 */
 #include "magick/studio.h"
 #include "magick/attribute.h"
+#include "magick/memory.h"
 #include "magick/monitor.h"
 #include "magick/pixel_cache.h"
 #include "magick/signature.h"
@@ -46,6 +47,35 @@
   Define declarations.
 */
 #define Trunc32(x)  ((x) & 0xffffffffUL)
+
+#define SignatureSize  64
+
+/*
+  Typedef declarations.
+*/
+typedef struct _SignatureInfo
+{
+  unsigned long
+    digest[8],
+    low_order,
+    high_order;
+
+  long
+    offset;
+
+  unsigned char
+    message[SignatureSize];
+} SignatureInfo;
+
+/*
+  Method declarations (FIXME: should be static!).
+*/
+extern MagickExport void
+  FinalizeSignature(SignatureInfo *),
+  GetSignatureInfo(SignatureInfo *),
+  TransformSignature(SignatureInfo *),
+  UpdateSignature(SignatureInfo *,const unsigned char *,const size_t);
+
 
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -202,7 +232,7 @@
   */
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
-  message=MagickAllocateArray(unsigned char *,20,image->columns);
+  message=MagickAllocateResourceLimitedArray(unsigned char *,20,image->columns);
   if (message == (unsigned char *) NULL)
     ThrowBinaryException3(ResourceLimitError,MemoryAllocationFailed,
       UnableToComputeImageSignature);
@@ -275,7 +305,7 @@
         break;
   }
   FinalizeSignature(&signature_info);
-  MagickFreeMemory(message);
+  MagickFreeResourceLimitedMemory(message);
   /*
     Convert digital signature to a 64 character hex string.
   */
diff -r 232cce2f8964 -r 709540d3e246 magick/signature.h
--- a/magick/signature.h	Tue Dec 21 11:23:54 2021 -0600
+++ b/magick/signature.h	Tue Dec 21 17:08:37 2021 -0600
@@ -16,39 +16,11 @@
 #endif
 
 /*
-  Define declarations.
-*/
-#define SignatureSize  64
-
-/*
-  Typedef declarations.
-*/
-typedef struct _SignatureInfo
-{
-  unsigned long
-    digest[8],
-    low_order,
-    high_order;
-
-  long
-    offset;
-
-  unsigned char
-    message[SignatureSize];
-} SignatureInfo;
-
-/*
   Method declarations.
 */
 extern MagickExport unsigned int
   SignatureImage(Image *);
 
-extern MagickExport void
-  FinalizeSignature(SignatureInfo *),
-  GetSignatureInfo(SignatureInfo *),
-  TransformSignature(SignatureInfo *),
-  UpdateSignature(SignatureInfo *,const unsigned char *,const size_t);
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
diff -r 232cce2f8964 -r 709540d3e246 www/Changelog.html
--- a/www/Changelog.html	Tue Dec 21 11:23:54 2021 -0600
+++ b/www/Changelog.html	Tue Dec 21 17:08:37 2021 -0600
@@ -37,9 +37,14 @@
 
 <p>2021-12-21  Bob Friesenhahn  &lt;<a class="reference external" \
href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#6 \
4;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
  <blockquote>
-* coders/png.c (DestroyJNG): Deallocate alpha_image temporary file in DestroyJNG().
+<p>* magick/signature.c: Remove functions FinalizeSignature,
+GetSignatureInfo, TransformSignature, UpdateSignature and other
+private implementation details from signature.h.  Use managed
+memory allocator.</p>
+<p>* coders/png.c (DestroyJNG): Deallocate alpha_image temporary file in \
DestroyJNG().  (ReadOnePNGImage): If setjmp fires, then don't return a broken
-image.</blockquote>
+image.</p>
+</blockquote>
 <p>2021-12-18  Fojtik Jaroslav  &lt;<a class="reference external" \
href="mailto:JaFojtik&#37;&#52;&#48;yandex&#46;com">JaFojtik<span>&#64;</span>yandex<span>&#46;</span>com</a>&gt;</p>
  <blockquote>
 * magick/wpg.c: Fix incorrect TrX and TrY elements in CTM.


_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit


[prev in list] [next in list] [prev in thread] [next in thread]