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

List:       kde-commits
Subject:    [digikam] libs/rawengine/libraw/libraw: fix compilation for Jenkins
From:       Maik Qualmann <metzpinguin () gmail ! com>
Date:       2016-07-28 20:02:29
Message-ID: E1bSrVl-0004bd-V6 () code ! kde ! org
[Download RAW message or body]

Git commit 3ffd00f41a07f08468dc7ea7d2a251e1de872453 by Maik Qualmann.
Committed on 28/07/2016 at 20:00.
Pushed by mqualmann into branch 'master'.

fix compilation for Jenkins

M  +16   -16   libs/rawengine/libraw/libraw/libraw_types.h

http://commits.kde.org/digikam/3ffd00f41a07f08468dc7ea7d2a251e1de872453

diff --git a/libs/rawengine/libraw/libraw/libraw_types.h b/libs/rawengine/l=
ibraw/libraw/libraw_types.h
index 2db112b..25d9647 100644
--- a/libs/rawengine/libraw/libraw/libraw_types.h
+++ b/libs/rawengine/libraw/libraw/libraw_types.h
@@ -208,7 +208,7 @@ typedef struct
   int          CanonColorDataSubVer;
   int          SpecularWhiteLevel;
   int          AverageBlackLevel;
-// metering
+/* metering */
   short        MeteringMode;
   short        SpotMeteringMode;
   uchar        FlashMeteringMode;
@@ -216,36 +216,36 @@ typedef struct
   short        ExposureMode;
   short        AESetting;
   uchar        HighlightTonePriority;
-// stabilization
+/* stabilization */
   short        ImageStabilization;
-// focus
+/* focus */
   short        FocusMode;
   short        AFPoint;
   short        FocusContinuous;
   short        AFPointsInFocus30D;
   uchar        AFPointsInFocus1D[8];
-  ushort       AFPointsInFocus5D;        // bytes in reverse
-// AFInfo
+  ushort       AFPointsInFocus5D;        /* bytes in reverse */
+/* AFInfo */
   ushort       AFAreaMode;
   ushort       NumAFPoints;
   ushort       ValidAFPoints;
   ushort       AFImageWidth;
   ushort       AFImageHeight;
-  short        AFAreaWidths[61];        // cycle to NumAFPoints
-  short        AFAreaHeights[61];       // --''--
-  short        AFAreaXPositions[61];    // --''--
-  short        AFAreaYPositions[61];    // --''--
-  short        AFPointsInFocus[4];      // cycle to floor((NumAFPoints+15)=
/16)
-  short        AFPointsSelected[4];     // --''--
+  short        AFAreaWidths[61];        /* cycle to NumAFPoints */
+  short        AFAreaHeights[61];       /* --''-- */
+  short        AFAreaXPositions[61];    /* --''-- */
+  short        AFAreaYPositions[61];    /* --''-- */
+  short        AFPointsInFocus[4];      /* cycle to floor((NumAFPoints+15)=
/16) */
+  short        AFPointsSelected[4];     /* --''-- */
   ushort       PrimaryAFPoint;
-// flash
+/* flash */
   short        FlashMode;
   short        FlashActivity;
   short        FlashBits;
   short        ManualFlashOutput;
   short        FlashOutput;
   short        FlashGuideNumber;
-// drive
+/* drive */
   short        ContinuousDrive;
 } libraw_canon_makernotes_t;
 =

@@ -270,11 +270,11 @@ typedef struct
   double       ExposureBracketValue;
   ushort       ActiveDLighting;
   ushort       ShootingMode;
-// stabilization
+/* stabilization */
   uchar        ImageStabilization[7];
   uchar        VibrationReduction;
   uchar        VRMode;
-// focus
+/* focus */
   char         FocusMode[7];
   uchar        AFPoint;
   ushort       AFPointsInFocus;
@@ -290,7 +290,7 @@ typedef struct
   ushort       AFAreaWidth;
   ushort       AFAreaHeight;
   uchar        ContrastDetectAFInFocus;
-// flash
+/* flash */
   char         FlashSetting[13];
   char         FlashType[20];
   uchar        FlashExposureCompensation[4];
[prev in list] [next in list] [prev in thread] [next in thread]