[gimp/gimp-2-10] app: remove defines GIMP_BRUSH_FILE_VERSION and GIMP_PATTERN_FILE_VERSION



commit 2608a7e2d6b2d1add4b3b139ee67cc4404417f5f
Author: Michael Natterer <mitch gimp org>
Date:   Fri Apr 12 16:30:29 2019 +0200

    app: remove defines GIMP_BRUSH_FILE_VERSION and GIMP_PATTERN_FILE_VERSION
    
    they were unused and wrong. Also clean up the brush and pattern
    headers a bit.
    
    (cherry picked from commit aee6d44b6142c6413c753a3442173fe4fc6d1f1b)

 app/core/gimpbrush-header.h   | 18 +++++++++---------
 app/core/gimppattern-header.h | 16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/app/core/gimpbrush-header.h b/app/core/gimpbrush-header.h
index 1633e73ac4..0e66715d07 100644
--- a/app/core/gimpbrush-header.h
+++ b/app/core/gimpbrush-header.h
@@ -19,11 +19,10 @@
 #define __GIMP_BRUSH_HEADER_H__
 
 
-#define GIMP_BRUSH_FILE_VERSION  2
-#define GIMP_BRUSH_MAGIC         (('G' << 24) + ('I' << 16) + \
-                                  ('M' << 8)  + ('P' << 0))
-#define GIMP_BRUSH_MAX_SIZE      10000 /* Max size in either dimension in px */
-#define GIMP_BRUSH_MAX_NAME      256   /* Max length of the brush's name     */
+#define GIMP_BRUSH_MAGIC    (('G' << 24) + ('I' << 16) + \
+                             ('M' << 8)  + ('P' << 0))
+#define GIMP_BRUSH_MAX_SIZE 10000 /* Max size in either dimension in px */
+#define GIMP_BRUSH_MAX_NAME 256   /* Max length of the brush's name     */
 
 
 /*  All field entries are MSB  */
@@ -36,14 +35,15 @@ struct _GimpBrushHeader
   guint32   version;      /*  brush file version #  */
   guint32   width;        /*  width of brush  */
   guint32   height;       /*  height of brush  */
-  guint32   bytes;        /*  depth of brush in bytes--always 1 */
+  guint32   bytes;        /*  depth of brush in bytes  */
   guint32   magic_number; /*  GIMP brush magic number  */
   guint32   spacing;      /*  brush spacing  */
 };
 
-/*  In a brush file, next comes the brush name, null-terminated.  After that
- *  comes the brush data--width * height * bytes bytes of it...
+/*  In a brush file, next comes the brush name, null-terminated.
+ *  After that comes the brush data -- width * height * bytes bytes of
+ *  it...
  */
 
 
-#endif  /*  __GIMP_BRUSH_HEADER_H__  */
+#endif /* __GIMP_BRUSH_HEADER_H__ */
diff --git a/app/core/gimppattern-header.h b/app/core/gimppattern-header.h
index d9ae91f9cf..e11b3c9cbd 100644
--- a/app/core/gimppattern-header.h
+++ b/app/core/gimppattern-header.h
@@ -19,11 +19,10 @@
 #define __GIMP_PATTERN_HEADER_H__
 
 
-#define GIMP_PATTERN_FILE_VERSION  1
-#define GIMP_PATTERN_MAGIC         (('G' << 24) + ('P' << 16) + \
-                                    ('A' << 8)  + ('T' << 0))
-#define GIMP_PATTERN_MAX_SIZE      10000 /* Max size in either dimension in px */
-#define GIMP_PATTERN_MAX_NAME      256   /* Max length of the pattern's name   */
+#define GIMP_PATTERN_MAGIC    (('G' << 24) + ('P' << 16) + \
+                               ('A' << 8)  + ('T' << 0))
+#define GIMP_PATTERN_MAX_SIZE 10000 /* Max size in either dimension in px */
+#define GIMP_PATTERN_MAX_NAME 256   /* Max length of the pattern's name   */
 
 
 /*  All field entries are MSB  */
@@ -40,9 +39,10 @@ struct _GimpPatternHeader
   guint32   magic_number; /*  GIMP pattern magic number  */
 };
 
-/*  In a pattern file, next comes the pattern name, null-terminated.  After that
- *  comes the pattern data--width * height * bytes bytes of it...
+/*  In a pattern file, next comes the pattern name, null-terminated.
+ *  After that comes the pattern data -- width * height * bytes bytes
+ *  of it...
  */
 
 
-#endif  /*  __GIMP_PATTERN_HEADER_H__  */
+#endif  /* __GIMP_PATTERN_HEADER_H__ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]