[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:36:41 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=134d57c
The following commit has been merged in the master branch:
commit 134d57c220f0a9400e2256c078e55df8595da275
Author: brad <chickb at gmail.com>
Date: Fri Oct 29 06:18:40 2004 +0000
fixed various msvc 7.1 build errors. bug #394
---
src/actions.cpp | 28 ++++++++++++++--------------
src/localtime.c | 24 ++++++++++++------------
src/tags.cpp | 1 +
src/types.hpp | 10 ++++++----
4 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/src/actions.cpp b/src/actions.cpp
index 498928b..07ce666 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -282,13 +282,13 @@ namespace Action {
done = true;
}
if (!done) {
- done = printTag(exifData, "Exif.Nikon1.ISOSpeed");
+ done = 0 != printTag(exifData, "Exif.Nikon1.ISOSpeed");
}
if (!done) {
- done = printTag(exifData, "Exif.Nikon2.ISOSpeed");
+ done = 0 != printTag(exifData, "Exif.Nikon2.ISOSpeed");
}
if (!done) {
- done = printTag(exifData, "Exif.Nikon3.ISOSpeed");
+ done = 0 != printTag(exifData, "Exif.Nikon3.ISOSpeed");
}
}
std::cout << "
";
@@ -321,7 +321,7 @@ namespace Action {
done = true;
}
if (!done) {
- done = printTag(exifData, "Exif.Fujifilm.Macro");
+ done = 0 != printTag(exifData, "Exif.Fujifilm.Macro");
}
std::cout << "
";
@@ -336,19 +336,19 @@ namespace Action {
done = true;
}
if (!done) {
- done = printTag(exifData, "Exif.Fujifilm.Quality");
+ done = 0 != printTag(exifData, "Exif.Fujifilm.Quality");
}
if (!done) {
- done = printTag(exifData, "Exif.Sigma.Quality");
+ done = 0 != printTag(exifData, "Exif.Sigma.Quality");
}
if (!done) {
- done = printTag(exifData, "Exif.Nikon1.Quality");
+ done = 0 != printTag(exifData, "Exif.Nikon1.Quality");
}
if (!done) {
- done = printTag(exifData, "Exif.Nikon2.Quality");
+ done = 0 != printTag(exifData, "Exif.Nikon2.Quality");
}
if (!done) {
- done = printTag(exifData, "Exif.Nikon3.Quality");
+ done = 0 != printTag(exifData, "Exif.Nikon3.Quality");
}
std::cout << "
";
@@ -377,19 +377,19 @@ namespace Action {
done = true;
}
if (!done) {
- done = printTag(exifData, "Exif.Fujifilm.WhiteBalance");
+ done = 0 != printTag(exifData, "Exif.Fujifilm.WhiteBalance");
}
if (!done) {
- done = printTag(exifData, "Exif.Sigma.WhiteBalance");
+ done = 0 != printTag(exifData, "Exif.Sigma.WhiteBalance");
}
if (!done) {
- done = printTag(exifData, "Exif.Nikon1.WhiteBalance");
+ done = 0 != printTag(exifData, "Exif.Nikon1.WhiteBalance");
}
if (!done) {
- done = printTag(exifData, "Exif.Nikon2.WhiteBalance");
+ done = 0 != printTag(exifData, "Exif.Nikon2.WhiteBalance");
}
if (!done) {
- done = printTag(exifData, "Exif.Nikon3.WhiteBalance");
+ done = 0 != printTag(exifData, "Exif.Nikon3.WhiteBalance");
}
std::cout << "
";
diff --git a/src/localtime.c b/src/localtime.c
index 31ac004..e294a19 100644
--- a/src/localtime.c
+++ b/src/localtime.c
@@ -87,7 +87,7 @@ static const char gmt[] = "GMT";
struct ttinfo { /* time type information */
long tt_gmtoff; /* UTC offset in seconds */
int tt_isdst; /* used to set tm_isdst */
- int tt_abbrind; /* abbreviation list index */
+ size_t tt_abbrind; /* abbreviation list index */
int tt_ttisstd; /* TRUE if transition is std time */
int tt_ttisgmt; /* TRUE if transition is UTC */
};
@@ -110,7 +110,7 @@ struct state {
int leapcnt;
int timecnt;
int typecnt;
- int charcnt;
+ size_t charcnt;
time_t ats[TZ_MAX_TIMES];
unsigned char types[TZ_MAX_TIMES];
struct ttinfo ttis[TZ_MAX_TYPES];
@@ -342,7 +342,7 @@ register struct state * const sp;
sp->leapcnt = (int) detzcode(u.tzhead.tzh_leapcnt);
sp->timecnt = (int) detzcode(u.tzhead.tzh_timecnt);
sp->typecnt = (int) detzcode(u.tzhead.tzh_typecnt);
- sp->charcnt = (int) detzcode(u.tzhead.tzh_charcnt);
+ sp->charcnt = detzcode(u.tzhead.tzh_charcnt);
p = u.tzhead.tzh_charcnt + sizeof u.tzhead.tzh_charcnt;
if (sp->leapcnt < 0 || sp->leapcnt > TZ_MAX_LEAPS ||
sp->typecnt <= 0 || sp->typecnt > TZ_MAX_TYPES ||
@@ -354,7 +354,7 @@ register struct state * const sp;
if (i - (p - u.buf) < sp->timecnt * 4 + /* ats */
sp->timecnt + /* types */
sp->typecnt * (4 + 2) + /* ttinfos */
- sp->charcnt + /* chars */
+ (int)sp->charcnt + /* chars */
sp->leapcnt * (4 + 4) + /* lsinfos */
ttisstdcnt + /* ttisstds */
ttisgmtcnt) /* ttisgmts */
@@ -382,7 +382,7 @@ register struct state * const sp;
ttisp->tt_abbrind > sp->charcnt)
return -1;
}
- for (i = 0; i < sp->charcnt; ++i)
+ for (i = 0; i < (int)sp->charcnt; ++i)
sp->chars[i] = *p++;
sp->chars[i] = '
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list