diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2011-04-04 23:35:45 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2011-04-04 23:35:45 +0200 |
| commit | 7cf6ccee8c6b59d8aac17ab6e4673bcb69f5e8d2 (patch) | |
| tree | b329db03bae14fca178add9909b78b050345c140 /fitz/filt_jpxd.c | |
| parent | efc46353676c27b24f2933dce78305796951a01e (diff) | |
| download | mupdf-7cf6ccee8c6b59d8aac17ab6e4673bcb69f5e8d2.tar.xz | |
Le Roi est mort, vive le Roi!
The run-together words are dead! Long live the underscores!
The postscript inspired naming convention of using all run-together
words has served us well, but it is now time for more readable code.
In this commit I have also added the sed script, rename.sed, that I used
to convert the source. Use it on your patches and application code.
Diffstat (limited to 'fitz/filt_jpxd.c')
| -rw-r--r-- | fitz/filt_jpxd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fitz/filt_jpxd.c b/fitz/filt_jpxd.c index 3ec06ab3..f5a65851 100644 --- a/fitz/filt_jpxd.c +++ b/fitz/filt_jpxd.c @@ -19,7 +19,7 @@ static void fz_opj_info_callback(const char *msg, void *client_data) } fz_error -fz_loadjpximage(fz_pixmap **imgp, unsigned char *data, int size) +fz_load_jpx_image(fz_pixmap **imgp, unsigned char *data, int size) { fz_pixmap *img; opj_event_mgr_t evtmgr; @@ -81,16 +81,16 @@ fz_loadjpximage(fz_pixmap **imgp, unsigned char *data, int size) switch (n) { - case 1: colorspace = fz_devicegray; break; - case 3: colorspace = fz_devicergb; break; - case 4: colorspace = fz_devicecmyk; break; + case 1: colorspace = fz_device_gray; break; + case 3: colorspace = fz_device_rgb; break; + case 4: colorspace = fz_device_cmyk; break; default: /* TODO: SMaskInData */ opj_image_destroy(jpx); return fz_throw("unknown jpx colorspace (%d components)", n); } - img = fz_newpixmap(colorspace, 0, 0, w, h); + img = fz_new_pixmap(colorspace, 0, 0, w, h); p = img->samples; for (y = 0; y < h; y++) |