From: Arnaud L. <as...@us...> - 2003-09-17 11:31:10
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1:/tmp/cvs-serv24778/libexif Modified Files: exif-content.c exif-data.c exif-entry.c Log Message: Drop EOL blanks and // comments Index: exif-content.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- exif-content.c 15 Dec 2002 11:41:11 -0000 1.7 +++ exif-content.c 17 Sep 2003 11:31:06 -0000 1.8 @@ -7,10 +7,10 @@ * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> -//#define DEBUG +/* #define DEBUG */ static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; Index: exif-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- exif-data.c 25 Aug 2003 04:44:30 -0000 1.26 +++ exif-data.c 17 Sep 2003 11:31:06 -0000 1.27 @@ -7,10 +7,10 @@ * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the @@ -32,7 +32,7 @@ #undef MAX #define MAX(a, b) (((a) > (b)) ? (a) : (b)) -//#define DEBUG +/* #define DEBUG */ static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00}; @@ -421,7 +421,7 @@ EXIF_FORMAT_LONG); exif_set_long (*d + 6 + offset + 4, data->priv->order, 1); - exif_set_long (*d + 6 + offset + 8, data->priv->order, + exif_set_long (*d + 6 + offset + 8, data->priv->order, data->size); offset += 12; } @@ -628,7 +628,7 @@ /* * IFD 0 offset (4 bytes, offset 10). * We will start 8 bytes after the - * EXIF header (2 bytes for order, another 2 for the test, and + * EXIF header (2 bytes for order, another 2 for the test, and * 4 bytes for the IFD 0 offset make 8 bytes together). */ *ds += 4; @@ -793,7 +793,7 @@ s = exif_get_short (e->data + (i * exif_format_get_size (e->format)), d->old); - exif_set_short (e->data + + exif_set_short (e->data + (i * exif_format_get_size (e->format)), d->new, s); } Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- exif-entry.c 6 Aug 2003 19:47:53 -0000 1.37 +++ exif-entry.c 17 Sep 2003 11:31:06 -0000 1.38 @@ -7,10 +7,10 @@ * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the @@ -30,7 +30,7 @@ #include <time.h> #include <math.h> -//#define DEBUG +/* #define DEBUG */ #undef MIN #define MIN(a, b) (((a) < (b)) ? (a) : (b)) @@ -201,9 +201,9 @@ case EXIF_TAG_COPYRIGHT: CF (e->format, EXIF_FORMAT_ASCII, v); - /* + /* * First part: Photographer. - * Some cameras store a string like " " here. Ignore it. + * Some cameras store a string like " " here. Ignore it. */ if (e->size && e->data && (strspn (e->data, " ") != strlen ((char *) e->data))) @@ -313,9 +313,9 @@ CF (e->format, EXIF_FORMAT_SRATIONAL, v); CC (e->components, 1, v); v_srat = exif_get_srational (e->data, o); - snprintf (v, sizeof (v), "%i/%i", (int) v_srat.numerator, + snprintf (v, sizeof (v), "%i/%i", (int) v_srat.numerator, (int) v_srat.denominator); - //FIXME: How do I calculate the APEX value? + /* FIXME: How do I calculate the APEX value? */ break; case EXIF_TAG_METERING_MODE: CF (e->format, EXIF_FORMAT_SHORT, v); @@ -586,10 +586,10 @@ } break; case EXIF_TAG_COLOR_SPACE: - CF (e->format, EXIF_FORMAT_SHORT, v); - CC (e->components, 1, v); - v_short = exif_get_short (e->data, o); - switch (v_short) { + CF (e->format, EXIF_FORMAT_SHORT, v); + CC (e->components, 1, v); + v_short = exif_get_short (e->data, o); + switch (v_short) { case 1: strncpy (v, _("sRGB"), sizeof (v)); break; @@ -602,7 +602,7 @@ } break; case EXIF_TAG_FLASH: - CF (e->format, EXIF_FORMAT_SHORT, v); + CF (e->format, EXIF_FORMAT_SHORT, v); CC (e->components, 1, v); v_short = exif_get_short (e->data, o); switch (v_short) { @@ -1006,7 +1006,7 @@ v_rat = exif_get_rational (e->data, o); if (!v_rat.denominator) return (NULL); - + /* * For calculation of the 35mm equivalent, * Minolta cameras need a multiplier that depends on the @@ -1160,7 +1160,7 @@ } break; case EXIF_TAG_FLASH: - CF (e->format, EXIF_FORMAT_SHORT, v); + CF (e->format, EXIF_FORMAT_SHORT, v); CC (e->components, 1, v); v_short = exif_get_short (e->data, o); switch (v_short) { @@ -1241,7 +1241,7 @@ e->data = malloc (e->size); exif_set_short (e->data, o, 0); break; - + /* SHORT, 1 component, default 1 */ case EXIF_TAG_ORIENTATION: case EXIF_TAG_PLANAR_CONFIGURATION: @@ -1305,7 +1305,7 @@ e->size = exif_format_get_size (e->format) * e->components; e->data = malloc (e->size); memset (e->data, 0, e->size); - break; + break; /* RATIONAL, 1 component, no default */ case EXIF_TAG_EXPOSURE_TIME: @@ -1374,7 +1374,7 @@ exif_set_rational ( e->data + 5 * exif_format_get_size (e->format), o, r); break; - + /* ASCII, 20 components */ case EXIF_TAG_DATE_TIME: case EXIF_TAG_DATE_TIME_ORIGINAL: @@ -1385,12 +1385,12 @@ e->format = EXIF_FORMAT_ASCII; e->size = exif_format_get_size (e->format) * e->components; e->data = malloc (e->size); - snprintf ((char *) e->data, e->size, + snprintf ((char *) e->data, e->size, "%04i:%02i:%02i %02i:%02i:%02i", tm->tm_year + 1900, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); break; - + /* ASCII, no default */ case EXIF_TAG_SUB_SEC_TIME: case EXIF_TAG_SUB_SEC_TIME_ORIGINAL: |