babl: harmonize order of fields in image/model/format

diff --git a/babl/babl-format.h b/babl/babl-format.h
index b3a4643def3efa9570fb42530d4c88ba1b1b82f5..9ebdcecb8a1eeefba280545897570c57bd8756a8 100644 (file)
--- a/babl/babl-format.h
+++ b/babl/babl-format.h
@@ -28,13 +28,13 @@ typedef struct
   int              components;
   BablComponent  **component;
   BablType       **type;
-  void            *model_data;
+  BablModel       *model;
   const Babl      *space;
+  void            *model_data;
   void            *image_template; /* image template for use with
                                       linear (non-planer) images */
 
   BablSampling   **sampling;
-  BablModel       *model;
   int              bytes_per_pixel;
   int              planar;
   double           loss; /*< average relative error when converting

diff --git a/babl/babl-image.h b/babl/babl-image.h
index ea7d05a1ecd64ea169313df6b260ac2b9870e95e..c20c06e5b56d34c392cc6467ab38dc5e700b5abf 100644 (file)
--- a/babl/babl-image.h
+++ b/babl/babl-image.h
@@ -48,10 +48,10 @@ typedef struct
 {
   BablInstance    instance;
   BablFormat     *format;    /*< (if known) */
-  BablModel      *model;     /*< (always known) */
   int             components;
   BablComponent **component;
   BablType      **type;
+  BablModel      *model;     /*< (always known) */
   BablSampling  **sampling;
   char          **data;
   int            *pitch;