diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-10-05 21:50:59 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-10-05 21:50:59 +0200 |
| commit | 987f96004f53c039dbcb72bcaeef940676d1368d (patch) | |
| tree | 88198103d0bf9632bbec67774e769c6b45707f25 /src/lib/openjpip | |
| parent | f7dbcf15128e4beda0b5894e0b9f16dcc23cfbe6 (diff) | |
| parent | 0b6a592372d6360ec64b8d1364b6ee56a1dd2a5f (diff) | |
Merge branch 'master' into travis-matrix
Diffstat (limited to 'src/lib/openjpip')
| -rw-r--r-- | src/lib/openjpip/cachemodel_manager.h | 2 | ||||
| -rw-r--r-- | src/lib/openjpip/imgsock_manager.c | 24 | ||||
| -rw-r--r-- | src/lib/openjpip/jpip_parser.c | 2 | ||||
| -rw-r--r-- | src/lib/openjpip/target_manager.h | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/openjpip/cachemodel_manager.h b/src/lib/openjpip/cachemodel_manager.h index ac54026d..041f1ad9 100644 --- a/src/lib/openjpip/cachemodel_manager.h +++ b/src/lib/openjpip/cachemodel_manager.h @@ -80,7 +80,7 @@ void print_cachemodel( cachemodel_param_t cachemodel); /** * search a cache model of a target * - * @param[in] target refering target + * @param[in] target referring target * @param[in] cachemodellist cache model list * @return found cache model pointer */ diff --git a/src/lib/openjpip/imgsock_manager.c b/src/lib/openjpip/imgsock_manager.c index 10e997b1..4337e608 100644 --- a/src/lib/openjpip/imgsock_manager.c +++ b/src/lib/openjpip/imgsock_manager.c @@ -181,19 +181,19 @@ void send_PNMstream( SOCKET connected_socket, Byte_t *pnmstream, unsigned int wi void send_SIZstream( SOCKET connected_socket, unsigned int width, unsigned int height) { - Byte_t responce[9]; + Byte_t response[9]; - responce[0] = 'S'; - responce[1] = 'I'; - responce[2] = 'Z'; - responce[3] = (width >> 16) & 0xff; - responce[4] = (width >> 8) & 0xff; - responce[5] = width & 0xff; - responce[6] = (height >> 16) & 0xff; - responce[7] = (height >> 8) & 0xff; - responce[8] = height & 0xff; - - send_stream( connected_socket, responce, 9); + response[0] = 'S'; + response[1] = 'I'; + response[2] = 'Z'; + response[3] = (width >> 16) & 0xff; + response[4] = (width >> 8) & 0xff; + response[5] = width & 0xff; + response[6] = (height >> 16) & 0xff; + response[7] = (height >> 8) & 0xff; + response[8] = height & 0xff; + + send_stream( connected_socket, response, 9); } void response_signal( SOCKET connected_socket, OPJ_BOOL succeed) diff --git a/src/lib/openjpip/jpip_parser.c b/src/lib/openjpip/jpip_parser.c index c206662d..d44c84c8 100644 --- a/src/lib/openjpip/jpip_parser.c +++ b/src/lib/openjpip/jpip_parser.c @@ -357,7 +357,7 @@ void enqueue_precincts( int xmin, int xmax, int ymin, int ymax, int tile_id, int Byte4_t xminP, xmaxP, yminP, ymaxP; codeidx = msgqueue->cachemodel->target->codeidx; - /* MM: shouldnt xmin/xmax be Byte4_t instead ? */ + /* MM: shouldn't xmin/xmax be Byte4_t instead ? */ if( xmin < 0 || xmax < 0 || ymin < 0 || ymax < 0) return; /* MM: I think the API should not really be int should it ? */ diff --git a/src/lib/openjpip/target_manager.h b/src/lib/openjpip/target_manager.h index 4ed99a79..561510f5 100644 --- a/src/lib/openjpip/target_manager.h +++ b/src/lib/openjpip/target_manager.h @@ -46,7 +46,7 @@ typedef struct target_param{ #endif int csn; /**< codestream number */ index_param_t *codeidx; /**< index information of codestream */ - int num_of_use; /**< numbers of sessions refering to this target */ + int num_of_use; /**< numbers of sessions referring to this target */ OPJ_BOOL jppstream; /**< if this target can return JPP-stream */ OPJ_BOOL jptstream; /**< if this target can return JPP-stream */ struct target_param *next; /**< pointer to the next target */ |