components/library/openjpeg/patches/openjpeg-01-index_t.patch

   1
   2 openjpip.h and openjpip.c can't use index_t as a convenience typedef,
   3 because OI inherited index_t in sys/types.h from Solaris.  Adjust to
   4 use the underlying index_param_t instead.
   5
   6 diff -ur openjpeg-2.3.1.orig/src/lib/openjpip/openjpip.h openjpeg-2.3.1/src/lib/openjpip/openjpip.h
   7 --- openjpeg-2.3.1.orig/src/lib/openjpip/openjpip.h     2019-04-02 07:45:15.000000000 +0000
   8 +++ openjpeg-2.3.1/src/lib/openjpip/openjpip.h  2019-06-10 18:57:32.089518326 +0000
   9 @@ -281,23 +281,20 @@
  10   *  test the format of index (cidx) box in JP2 file
  11   */
  12
  13 -/** Redefinition of index parameters*/
  14 -typedef index_param_t index_t;
  15 -
  16  /**
  17   * Parse JP2 file and get index information from cidx box inside
  18   *
  19   * @param[in] fd file descriptor of the JP2 file
  20   * @return       pointer to the generated structure of index parameters
  21   */
  22 -OPJ_API index_t * OPJ_CALLCONV get_index_from_JP2file(int fd);
  23 +OPJ_API index_param_t * OPJ_CALLCONV get_index_from_JP2file(int fd);
  24
  25  /**
  26   * Destroy index parameters
  27   *
  28   * @param[in,out] idx addressof the index pointer
  29   */
  30 -OPJ_API void OPJ_CALLCONV destroy_index(index_t **idx);
  31 +OPJ_API void OPJ_CALLCONV destroy_index(index_param_t **idx);
  32
  33
  34  /**
  35 @@ -305,7 +302,7 @@
  36   *
  37   * @param[in] index index parameters
  38   */
  39 -OPJ_API void OPJ_CALLCONV output_index(index_t *index);
  40 +OPJ_API void OPJ_CALLCONV output_index(index_param_t *index);
  41
  42  #endif /*SERVER*/
  43
  44 diff -ur openjpeg-2.3.1.orig/src/lib/openjpip/openjpip.c openjpeg-2.3.1/src/lib/openjpip/openjpip.c
  45 --- openjpeg-2.3.1.orig/src/lib/openjpip/openjpip.c     2019-04-02 07:45:15.000000000 +0000
  46 +++ openjpeg-2.3.1/src/lib/openjpip/openjpip.c  2019-06-10 18:58:14.867415880 +0000
  47 @@ -443,7 +443,7 @@
  48      opj_free(*dec);
  49  }
  50
  51 -index_t * OPJ_CALLCONV get_index_from_JP2file(int fd)
  52 +index_param_t * OPJ_CALLCONV get_index_from_JP2file(int fd)
  53  {
  54      char *data;
  55
  56 @@ -471,12 +471,12 @@
  57      return parse_jp2file(fd);
  58  }
  59
  60 -void OPJ_CALLCONV destroy_index(index_t **idx)
  61 +void OPJ_CALLCONV destroy_index(index_param_t **idx)
  62  {
  63      delete_index(idx);
  64  }
  65
  66 -void OPJ_CALLCONV output_index(index_t *index)
  67 +void OPJ_CALLCONV output_index(index_param_t *index)
  68  {
  69      print_index(*index);
  70  }
  71 diff -ur openjpeg-2.3.1.orig/src/bin/jpip/opj_jpip_test.c openjpeg-2.3.1/src/bin/jpip/opj_jpip_test.c
  72 --- openjpeg-2.3.1.orig/src/bin/jpip/opj_jpip_test.c    2019-04-02 07:45:15.000000000 +0000
  73 +++ openjpeg-2.3.1/src/bin/jpip/opj_jpip_test.c 2019-06-10 18:58:50.711326186 +0000
  74 @@ -52,7 +52,7 @@
  75  main(int argc, char *argv[])
  76  {
  77      int fd;
  78 -    index_t *jp2idx;
  79 +    index_param_t *jp2idx;
  80      if (argc < 2) {
  81          return 1;
  82      }