Update to jhead-3.02.

This commit is contained in:
benoit 2018-12-19 09:17:02 +00:00
parent 0ecec9c058
commit b283df0496
4 changed files with 25 additions and 23 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.21 2015/02/04 07:00:15 benoit Exp $
# $OpenBSD: Makefile,v 1.22 2018/12/19 09:17:02 benoit Exp $
COMMENT = Exif jpeg camera setting parser and thumbnail remover
DISTNAME = jhead-3.00
DISTNAME = jhead-3.02
CATEGORIES = graphics
HOMEPAGE = http://www.sentex.net/~mwandel/jhead/

View File

@ -1,2 +1,2 @@
SHA256 (jhead-3.00.tar.gz) = iMwB2gGOJC/i4F23P5G2KIEGhY3XDydQbEmJpXXSiV4=
SIZE (jhead-3.00.tar.gz) = 69151
SHA256 (jhead-3.02.tar.gz) = hclzfD3MhLRApnMH3p92y+52EGl7+vSHfdRq/XHH7So=
SIZE (jhead-3.02.tar.gz) = 67634

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-gpsinfo_c,v 1.4 2009/10/01 20:20:27 benoit Exp $
--- gpsinfo.c.orig Mon Mar 2 08:34:10 2009
+++ gpsinfo.c Wed Sep 30 16:49:45 2009
@@ -145,9 +145,10 @@ void ProcessGpsInfo(unsigned char * DirStart, int Byte
$OpenBSD: patch-gpsinfo_c,v 1.5 2018/12/19 09:17:02 benoit Exp $
Index: gpsinfo.c
--- gpsinfo.c.orig
+++ gpsinfo.c
@@ -145,9 +145,10 @@ void ProcessGpsInfo(unsigned char * DirStart, unsigned
FmtString[3+a*7] = (char)('0'+digits);
Values[a] = ConvertAnyFormat(ValuePtr+a*ComponentSize, Format);
@ -14,7 +15,7 @@ $OpenBSD: patch-gpsinfo_c,v 1.4 2009/10/01 20:20:27 benoit Exp $
if (Tag == TAG_GPS_LAT){
strncpy(ImageInfo.GpsLat+2, TempString, 29);
@@ -161,8 +162,8 @@ void ProcessGpsInfo(unsigned char * DirStart, int Byte
@@ -161,8 +162,8 @@ void ProcessGpsInfo(unsigned char * DirStart, unsigned
break;
case TAG_GPS_ALT:

View File

@ -1,6 +1,7 @@
--- jhead.c.orig Mon Feb 2 23:24:06 2015
+++ jhead.c Wed Feb 4 07:43:36 2015
@@ -164,7 +164,8 @@
Index: jhead.c
--- jhead.c.orig
+++ jhead.c
@@ -165,7 +165,8 @@ static int FileEditComment(char * TempFileName, char *
}
if (strlen(Editor) > PATH_MAX) ErrFatal("env too long");
@ -10,7 +11,7 @@
a = system(QuotedPath);
}
@@ -271,7 +272,8 @@
@@ -272,7 +273,8 @@ static int ModifyDescriptComment(char * OutComment, ch
if (!HasScandate && !ImageInfo.DateTime[0]){
// Scan date is not in the file yet, and it doesn't have one built in. Add it.
char Temp[40];
@ -20,7 +21,7 @@
strncat(OutComment, Temp, MAX_COMMENT_SIZE-5-strlen(OutComment));
Modified = TRUE;
}
@@ -303,8 +305,10 @@
@@ -304,8 +306,10 @@ static int AutoResizeCmdStuff(void)
if (scale < 0.4) scale = 0.4; // Don't scale down by too much.
@ -33,7 +34,7 @@
return TRUE;
}
@@ -625,7 +629,8 @@
@@ -632,7 +636,8 @@ static void DoFileRenaming(const char * FileName)
memcpy(pat, pattern+ppos, 4);
pat[a-ppos] = 'd'; // Replace 'i' with 'd' for '%d'
pat[a-ppos+1] = '\0';
@ -43,7 +44,7 @@
nl = strlen(num);
l = strlen(pattern+a+1);
if (ppos+nl+l+1 >= PATH_MAX) ErrFatal("str overflow");
@@ -641,7 +646,7 @@
@@ -648,7 +653,7 @@ static void DoFileRenaming(const char * FileName)
strftime(NewName, PATH_MAX, pattern, &tm);
}else{
// My favourite scheme.
@ -52,7 +53,7 @@
tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
}
@@ -670,7 +675,7 @@
@@ -677,7 +682,7 @@ static void DoFileRenaming(const char * FileName)
NameExtra[0] = 0;
}
@ -61,7 +62,7 @@
if (!strcmp(FileName, NewName)) break; // Skip if its already this name.
@@ -685,7 +690,8 @@
@@ -692,7 +697,8 @@ static void DoFileRenaming(const char * FileName)
printf("%s --> %s\n",FileName, NewName);
#ifdef _WIN32
if (RenameAssociatedFiles){
@ -71,8 +72,8 @@
RenameAssociated(FileName, NewName);
}
#endif
@@ -718,7 +724,8 @@
ErrNonfatal("Unknown orientation tag",0,0);
@@ -726,7 +732,8 @@ static int DoAutoRotate(const char * FileName)
// Unknown orientation, but still modified.
return TRUE; // Image is still modified.
}
- sprintf(RotateCommand, "jpegtran -trim -%s -outfile &o &i", Argument);
@ -81,7 +82,7 @@
ApplyCommand = RotateCommand;
DoCommand(FileName, FALSE);
ApplyCommand = NULL;
@@ -737,7 +744,8 @@
@@ -745,7 +752,8 @@ static int DoAutoRotate(const char * FileName)
strcpy(ThumbTempName_out, FileName);
strcat(ThumbTempName_out, ".tho");
SaveThumbnail(ThumbTempName_in);
@ -91,7 +92,7 @@
Argument, ThumbTempName_out, ThumbTempName_in);
if (system(RotateCommand) == 0){
@@ -765,7 +773,8 @@
@@ -773,7 +781,8 @@ static int RegenerateThumbnail(const char * FileName)
return FALSE;
}
@ -101,7 +102,7 @@
RegenThumbnail, RegenThumbnail, FileName);
if (system(ThumbnailGenCommand) == 0){
@@ -1134,7 +1143,7 @@
@@ -1143,7 +1152,7 @@ static void ProcessFile(const char * FileName)
// Print to temp buffer first to avoid putting null termination in destination.
// snprintf() would do the trick, hbut not available everywhere (like FreeBSD 4.4)