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

[trunk] Remove junk from merge

This commit is contained in:
Mathieu Malaterre 2012-03-02 10:49:53 +00:00
parent b158c25dc3
commit 647551b8e4
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
applications/jpip/libopenjpip/target_manager.c
View File

@ -135,9 +135,6 @@ void unrefer_target( target_param_t *target)
void delete_target( target_param_t **target) void delete_target( target_param_t **target)
{ {
close( (*target)->fd); close( (*target)->fd);
<<<<<<< .working
=======
#ifdef SERVER #ifdef SERVER
if( (*target)->tmpfname){ if( (*target)->tmpfname){
@ -146,7 +143,6 @@ void delete_target( target_param_t **target)
} }
#endif #endif
>>>>>>> .merge-right.r1103
if( (*target)->codeidx) if( (*target)->codeidx)
delete_index ( &(*target)->codeidx); delete_index ( &(*target)->codeidx);
@ -244,28 +240,17 @@ target_param_t * search_targetBytid( char tid[], targetlist_param_t *targetlist)
return NULL; return NULL;
} }
<<<<<<< .working
int open_jp2file( char filename[])
=======
int open_remotefile( char filepath[], char tmpfname[]); int open_remotefile( char filepath[], char tmpfname[]);
int open_jp2file( char filepath[], char tmpfname[]) int open_jp2file( char filepath[], char tmpfname[])
>>>>>>> .merge-right.r1103
{ {
int fd; int fd;
char *data; char *data;
<<<<<<< .working
if( (fd = open( filename, O_RDONLY)) == -1){
fprintf( FCGI_stdout, "Reason: Target %s not found\r\n", filename);
return -1;
=======
// download remote target file to local storage // download remote target file to local storage
if( strncmp( filepath, "http://", 7) == 0){ if( strncmp( filepath, "http://", 7) == 0){
if( (fd = open_remotefile( filepath, tmpfname)) == -1) if( (fd = open_remotefile( filepath, tmpfname)) == -1)
return -1; return -1;
>>>>>>> .merge-right.r1103
} }
// Check resource is a JP family file. // Check resource is a JP family file.
if( lseek( fd, 0, SEEK_SET)==-1){ if( lseek( fd, 0, SEEK_SET)==-1){
@ -292,8 +277,6 @@ int open_jp2file( char filepath[], char tmpfname[])
free( data); free( data);
return fd; return fd;
} }
<<<<<<< .working
=======
#ifdef SERVER #ifdef SERVER
static size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream); static size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream);
@ -340,4 +323,3 @@ static size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream)
return written; return written;
} }
#endif //SERVER #endif //SERVER
>>>>>>> .merge-right.r1103