walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[1.5] Need to compile/install tool to embed XML file in JP2 for jpip server

This commit is contained in:
Mathieu Malaterre 2012-04-20 11:15:48 +00:00
parent 65f8ae765e
commit 6b649f3bf6
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applications/jpip/util/CMakeLists.txt
View File

@ -4,6 +4,14 @@ INCLUDE_DIRECTORIES(
${FCGI_INCLUDE_DIRS} ${FCGI_INCLUDE_DIRS}
) )
# Tool to embed metadata into JP2 file
ADD_EXECUTABLE(addXMLinJP2 addXMLinJP2.c)
# Install exe
INSTALL(TARGETS addXMLinJP2
EXPORT OpenJPEGTargets
DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
)
IF(BUILD_JPIP_SERVER) IF(BUILD_JPIP_SERVER)
SET(OPJ_SERVER_SRCS SET(OPJ_SERVER_SRCS

20
applications/jpip/util/addXMLinJP2.c
View File

@ -73,15 +73,15 @@ char * read_xmlfile( char filename[], long *fsize);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
FILE *fp;
char *xmldata, type[]="xml ";
long fsize, boxsize;
if( argc<3){ if( argc<3){
fprintf( stderr, "USAGE: ./addXMLinJP2 modifing.jp2 adding.xml\n"); fprintf( stderr, "USAGE: ./addXMLinJP2 modifing.jp2 adding.xml\n");
return -1; return -1;
} }
FILE *fp;
char *xmldata, type[]="xml ";
long fsize, boxsize;
fp = open_jp2file( argv[1]); fp = open_jp2file( argv[1]);
if( !fp) if( !fp)
return -1; return -1;
@ -94,7 +94,7 @@ int main(int argc, char *argv[])
fputc( (boxsize>>8)&0xff, fp); fputc( (boxsize>>8)&0xff, fp);
fputc( boxsize&0xff, fp); fputc( boxsize&0xff, fp);
fwrite( type, 4, 1, fp); fwrite( type, 4, 1, fp);
fwrite( xmldata, fsize, 1, fp); fwrite( xmldata, (size_t)fsize, 1, fp);
free( xmldata); free( xmldata);
fclose(fp); fclose(fp);
@ -111,14 +111,14 @@ FILE * open_jp2file( char filename[])
fprintf( stderr, "Original JP2 %s not found\n", filename); fprintf( stderr, "Original JP2 %s not found\n", filename);
return NULL; return NULL;
} }
// Check resource is a JP family file. /* Check resource is a JP family file. */
if( fseek( fp, 0, SEEK_SET)==-1){ if( fseek( fp, 0, SEEK_SET)==-1){
fclose(fp); fclose(fp);
fprintf( stderr, "Original JP2 %s broken (fseek error)\n", filename); fprintf( stderr, "Original JP2 %s broken (fseek error)\n", filename);
return NULL; return NULL;
} }
data = (char *)malloc( 12); // size of header data = (char *)malloc( 12); /* size of header */
if( fread( data, 12, 1, fp) != 1){ if( fread( data, 12, 1, fp) != 1){
free( data); free( data);
fclose(fp); fclose(fp);
@ -142,7 +142,7 @@ char * read_xmlfile( char filename[], long *fsize)
FILE *fp; FILE *fp;
char *data; char *data;
// fprintf( stderr, "open %s\n", filename); /* fprintf( stderr, "open %s\n", filename); */
if(!(fp = fopen( filename, "r"))){ if(!(fp = fopen( filename, "r"))){
fprintf( stderr, "XML file %s not found\n", filename); fprintf( stderr, "XML file %s not found\n", filename);
return NULL; return NULL;
@ -166,9 +166,9 @@ char * read_xmlfile( char filename[], long *fsize)
return NULL; return NULL;
} }
data = (char *)malloc( *fsize); data = (char *)malloc( (size_t)*fsize);
if( fread( data, *fsize, 1, fp) != 1){ if( fread( data, (size_t)*fsize, 1, fp) != 1){
fprintf( stderr, "XML file %s broken (read error)\n", filename); fprintf( stderr, "XML file %s broken (read error)\n", filename);
free( data); free( data);
fclose(fp); fclose(fp);