Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-11-20 17:19:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-11-20 17:19:21 +0300
commit8c6c6d01f4b0112a7ad0cc51fa37ed7de8592eac (patch)
tree0eac1de67a17bd5f0734eafa7e12a7291fccedf5 /source/blender/imbuf/intern/jp2.c
parent6aea182b1e174a78443672596bc6dcd35cad413a (diff)
WITH_OPENJPEG wasn't defined for CMake or SCons, which meant blender couldn't save jpeg2000 images from the file selector.
also fixed typo in jp2.c
Diffstat (limited to 'source/blender/imbuf/intern/jp2.c')
-rw-r--r--source/blender/imbuf/intern/jp2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index 3f0443e5a88..49920219d8c 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -55,14 +55,14 @@ typedef struct img_folder{
float *rates;
}img_fol_t;
-static int checkj2p(unsigned char *mem) /* J2K_CFMT */
+static int check_jp2(unsigned char *mem) /* J2K_CFMT */
{
return memcmp(JP2_HEAD, mem, 12) ? 0 : 1;
}
int imb_is_a_jp2(unsigned char *buf)
{
- return checkj2p(buf);
+ return check_jp2(buf);
}
@@ -112,7 +112,7 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */
opj_cio_t *cio = NULL;
- if (checkj2p(mem) == 0) return(0);
+ if (check_jp2(mem) == 0) return(0);
/* configure the event callbacks (not required) */
memset(&event_mgr, 0, sizeof(opj_event_mgr_t));