summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipdfm-x/jpegimage.c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-09-25 07:25:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-09-25 07:25:45 +0000
commit576aecf55169a363532f3ff3c1e017f5a160fea4 (patch)
treeca08bf29ad11d6ae65f6c86dec6857b91763a6af /Build/source/texk/dvipdfm-x/jpegimage.c
parente38959e5a4852c628af4a12d236086a299680671 (diff)
texk/dvipdfm-x: More cleanup (whitespace and long => int or uint32_t)
git-svn-id: svn://tug.org/texlive/trunk@35252 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/jpegimage.c')
-rw-r--r--Build/source/texk/dvipdfm-x/jpegimage.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/Build/source/texk/dvipdfm-x/jpegimage.c b/Build/source/texk/dvipdfm-x/jpegimage.c
index be4f8fca4c9..7ec4dcfda54 100644
--- a/Build/source/texk/dvipdfm-x/jpegimage.c
+++ b/Build/source/texk/dvipdfm-x/jpegimage.c
@@ -2,19 +2,19 @@
Copyright (C) 2002-2014 by Jin-Hwan Cho and Shunsaku Hirata,
the dvipdfmx project team.
-
+
Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks@kettering.edu>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program 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 General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -541,10 +541,10 @@ read_APP14_Adobe (struct JPEG_info *j_info, FILE *fp)
return 7;
}
-static unsigned long
+static unsigned int
read_exif_bytes(unsigned char **p, int n, int b)
{
- unsigned long rval = 0;
+ unsigned int rval = 0;
unsigned char *pp = *p;
if (b) {
switch (n) {
@@ -659,7 +659,7 @@ read_APP1_Exif (struct JPEG_info *j_info, FILE *fp, unsigned short length)
}
}
}
-
+
j_info->xdpi = xres * res_unit;
j_info->ydpi = yres * res_unit;
@@ -747,7 +747,7 @@ static int
JPEG_copy_stream (struct JPEG_info *j_info, pdf_obj *stream, FILE *fp)
{
JPEG_marker marker;
- long length, nb_read;
+ int length, nb_read;
int found_SOFn, count;
rewind(fp);
@@ -922,7 +922,7 @@ JPEG_scan_file (struct JPEG_info *j_info, FILE *fp)
}
int
-jpeg_get_bbox (FILE *fp, long *width, long *height,
+jpeg_get_bbox (FILE *fp, int *width, int *height,
double *xdensity, double *ydensity)
{
struct JPEG_info j_info;