BlinkenLib

@@ -5,6 +5,10 @@

 #ifndef INC_BlinkenLib_BlinkenColorizer

 #define INC_BlinkenLib_BlinkenColorizer

+#ifdef __cplusplus

+extern "C" {

+#endif

+

 // convert string to colorizing mode

 // returns colorizing mode (>= 0) or -1 on error

 int BlinkenColorizerStr2Mode(const char *str);

@@ -16,4 +20,8 @@ const char *BlinkenColorizerMode2Str(int mode);

 unsigned char BlinkenColorizerGetColor(int channels, int mode, int step,

                                        int y, int x, int c);

+#ifdef __cplusplus

+} // extern "C"

+#endif

+

 #endif // #ifndef INC_BlinkenLib_BlinkenColorizer

@@ -90,7 +90,7 @@ stBlinkenFrame *BlinkenFrameNew(int height, int width, int channels,

   pFrame->duration = duration;

   pFrame->ppData =

-      (unsigned char **)malloc2D(height, width * channels,

+      (unsigned char **)BlinkenMalloc2D(height, width * channels,

                                         sizeof(unsigned char));

   if (pFrame->ppData == NULL) {

     free(pFrame);

@@ -395,7 +395,7 @@ void BlinkenFrameResize(stBlinkenFrame *pFrame, int height, int width,

   // allocate new data array

   ppData =

-      (unsigned char **)malloc2D(height, width * channels,

+      (unsigned char **)BlinkenMalloc2D(height, width * channels,

                                         sizeof(unsigned char));

   if (ppData == NULL)

     return;

@@ -491,7 +491,7 @@ void BlinkenFrameScale(stBlinkenFrame *pFrame, int height, int width)

   // allocate new data array

   ppData =

-      (unsigned char **)malloc2D(height, width * pFrame->channels,

+      (unsigned char **)BlinkenMalloc2D(height, width * pFrame->channels,

                                         sizeof(unsigned char));

   if (ppData == NULL)

     return;

@@ -612,7 +612,8 @@ void BlinkenFrameColorize(stBlinkenFrame *pFrame, int channels, int mode,

   // allocate new data array

   ppData =

-      (unsigned char **)malloc2D(pFrame->height, pFrame->width * channels,

+      (unsigned char **)BlinkenMalloc2D(pFrame->height,

+                                        pFrame->width * channels,

                                         sizeof(unsigned char));

   if (ppData == NULL)

     return;

@@ -869,7 +870,7 @@ int BlinkenFrameToNetwork(stBlinkenFrame *pFrame, etBlinkenProto proto,

   }

 }

-stBlinkenFrame *BlinkenFrameFromNetwork(char *pData, int length,

+stBlinkenFrame *BlinkenFrameFromNetwork(const char *pData, int length,

                                         etBlinkenProto * pProto)

 // returns protocol in *pProto if pProto not NULL

 {

@@ -881,32 +882,14 @@ stBlinkenFrame *BlinkenFrameFromNetwork(char *pData, int length,

   {

     if (pProto != NULL) // return protocol

       *pProto = BlinkenProtoBlp;

-    height = ntohs(((stBlinkenProtoBlpHdr *) pData)->height);   // get header 

-                                                                // 

-    // 

-    // 

-    // 

-    // 

-    // data

+    // get header data

+    height = ntohs(((stBlinkenProtoBlpHdr *) pData)->height);

     width = ntohs(((stBlinkenProtoBlpHdr *) pData)->width);

-    if (length < (int)sizeof(stBlinkenProtoBlpHdr) + height * width)    // check 

-                                                                        // 

-      // 

-      // 

-      // 

-      // 

-      // length 

-      // of 

-      // packet

+    // check length of packet

+    if (length < (int)sizeof(stBlinkenProtoBlpHdr) + height * width)

       return NULL;

-    if (height < BlinkenHeightMin || height > BlinkenHeightMax ||       // check 

-                                                                        // 

-        // 

-        // 

-        // 

-        // 

-        // header 

-        // data

+    // check header data

+    if (height < BlinkenHeightMin || height > BlinkenHeightMax ||

         width < BlinkenWidthMin || width > BlinkenWidthMax)

       return NULL;

     pFrame = BlinkenFrameNew(height, width, 1, 1, 0);   // create frame

@@ -926,32 +909,14 @@ stBlinkenFrame *BlinkenFrameFromNetwork(char *pData, int length,

       htonl(BlinkenProtoEblpMagic)) {

     if (pProto != NULL) // return protocol

       *pProto = BlinkenProtoEblp;

-    height = ntohs(((stBlinkenProtoEblpHdr *) pData)->height);  // get header 

-                                                                // 

-    // 

-    // 

-    // 

-    // 

-    // data

+    // get header data

+    height = ntohs(((stBlinkenProtoEblpHdr *) pData)->height);

     width = ntohs(((stBlinkenProtoEblpHdr *) pData)->width);

-    if (length < (int)sizeof(stBlinkenProtoEblpHdr) + width * height)   // check 

-                                                                        // 

-      // 

-      // 

-      // 

-      // 

-      // length 

-      // of 

-      // packet

+    // check length of packet

+    if (length < (int)sizeof(stBlinkenProtoEblpHdr) + width * height)

       return NULL;

-    if (height < BlinkenHeightMin || height > BlinkenHeightMax ||       // check 

-                                                                        // 

-        // 

-        // 

-        // 

-        // 

-        // header 

-        // data

+    // check header data

+    if (height < BlinkenHeightMin || height > BlinkenHeightMax ||

         width < BlinkenWidthMin || width > BlinkenWidthMax)

       return NULL;

     pFrame = BlinkenFrameNew(height, width, 1, 255, 0); // create frame

@@ -971,49 +936,22 @@ stBlinkenFrame *BlinkenFrameFromNetwork(char *pData, int length,

       htonl(BlinkenProtoMcufMagic)) {

     if (pProto != NULL) // return protocol

       *pProto = BlinkenProtoMcuf;

-    height = ntohs(((stBlinkenProtoMcufHdr *) pData)->height);  // get header 

-                                                                // 

-    // 

-    // 

-    // 

-    // 

-    // data

+    // get header data

+    height = ntohs(((stBlinkenProtoMcufHdr *) pData)->height);

     width = ntohs(((stBlinkenProtoMcufHdr *) pData)->width);

     channels = ntohs(((stBlinkenProtoMcufHdr *) pData)->channels);

     maxval = ntohs(((stBlinkenProtoMcufHdr *) pData)->maxval);

-    if (length < (int)sizeof(stBlinkenProtoMcufHdr) + height * width * channels)        // check 

-                                                                                        // 

-      // 

-      // 

-      // 

-      // 

-      // length 

-      // of 

-      // packet

+    // check length of packet

+    if (length < (int)sizeof(stBlinkenProtoMcufHdr) + height * width * channels)

       return NULL;

-    if (height < BlinkenHeightMin || height > BlinkenHeightMax ||       // check 

-                                                                        // 

-        // 

-        // 

-        // 

-        // 

-        // header 

-        // data

+    // check header data

+    if (height < BlinkenHeightMin || height > BlinkenHeightMax ||

         width < BlinkenWidthMin || width > BlinkenWidthMax ||

         channels < BlinkenChannelsMin || channels > BlinkenChannelsMax ||

         maxval < BlinkenMaxvalMin || maxval > BlinkenMaxvalMax)

       return NULL;

-    pFrame = BlinkenFrameNew(height, width, channels, maxval, 0);       // create 

-                                                                        // 

-    // 

-    // 

-    // 

-    // 

-    // frame 

-    // according 

-    // to 

-    // header 

-    // data

+    // create frame according to header data

+    pFrame = BlinkenFrameNew(height, width, channels, maxval, 0);

     if (pFrame == NULL)

       return NULL;

     i = sizeof(stBlinkenProtoMcufHdr);  // put data into frame

@@ -5,6 +5,10 @@

 #ifndef INC_BlinkenLib_BlinkenFrame

 #define INC_BlinkenLib_BlinkenFrame

+#ifdef __cplusplus

+extern "C" {

+#endif

+

 typedef struct sBlinkenFrame stBlinkenFrame;

 typedef enum eBlinkenProto { BlinkenProtoNone, BlinkenProtoBlp,

@@ -58,8 +62,12 @@ int BlinkenFrameToNetwork(stBlinkenFrame *pFrame, etBlinkenProto proto,

                           char *pData, int maxLength);

 // returns length or -1 on error

-stBlinkenFrame *BlinkenFrameFromNetwork(char *pData, int length,

+stBlinkenFrame *BlinkenFrameFromNetwork(const char *pData, int length,

                                         etBlinkenProto * pProto);

 // returns protocol in *pProto if pProto not NULL

+#ifdef __cplusplus

+} // extern "C"

+#endif

+

 #endif // #ifndef INC_BlinkenLib_BlinkenFrame

@@ -231,7 +231,7 @@ void BlMng_compress_frame(stBlinkenFrame *frame, unsigned char **p_out_ptr,

 }

 // load a MNG file as BlinkenMovie

-stBlinkenMovie *BlinkenMngLoad(char *pFilename)

+stBlinkenMovie *BlinkenMngLoad(const char *pFilename)

 {

   BlMng_userdata *data;

   mng_handle hMNG;

@@ -367,7 +367,7 @@ stBlinkenMovie *BlinkenMngLoad(char *pFilename)

   return movie;

 }

-int BlinkenMngSave(stBlinkenMovie *pMovie, char *pFilename)

+int BlinkenMngSave(stBlinkenMovie *pMovie, const char *pFilename)

 {

   BlMng_userdata *data;

   mng_handle hMNG;

@@ -13,8 +13,16 @@

 #error This file is to be used for MNG support only.

 #endif // #ifndef BLINKENLIB_CFG_MNG

-stBlinkenMovie *BlinkenMngLoad(char *pFilename);

+#ifdef __cplusplus

+extern "C" {

+#endif

-int BlinkenMngSave(stBlinkenMovie *pMovie, char *pFilename);

+stBlinkenMovie *BlinkenMngLoad(const char *pFilename);

+

+int BlinkenMngSave(stBlinkenMovie *pMovie, const char *pFilename);

+

+#ifdef __cplusplus

+} // extern "C"

+#endif

 #endif // #ifndef INC_BlinkenLib_BlinkenMng

@@ -94,14 +94,14 @@ stBlinkenMovie *BlinkenMovieNew(int height, int width, int channels,

   pMovie->channels = channels;

   pMovie->maxval = maxval;

   pMovie->infoCnt = 0;

-  pMovie->pppInfos = (char ***)malloc2D(0, 2, sizeof(char *));

+  pMovie->pppInfos = (char ***)BlinkenMalloc2D(0, 2, sizeof(char *));

   if (pMovie->pppInfos == NULL) {

     free(pMovie);

     return NULL;

   }

   pMovie->frameCnt = 0;

   pMovie->ppFrames =

-      (stBlinkenFrame **) malloc1D(0, sizeof(stBlinkenFrame *));

+      (stBlinkenFrame **) BlinkenMalloc1D(0, sizeof(stBlinkenFrame *));

   if (pMovie->ppFrames == NULL) {

     free(pMovie->pppInfos);

     free(pMovie);

@@ -233,8 +233,8 @@ char *BlinkenMovieGetInfoData(stBlinkenMovie *pMovie, int infoNo)

   return pMovie->pppInfos[infoNo][1];

 }

-void BlinkenMovieSetInfo(stBlinkenMovie *pMovie, int infoNo, char *pInfoType,

-                         char *pInfoData)

+void BlinkenMovieSetInfo(stBlinkenMovie *pMovie, int infoNo,

+                         const char *pInfoType, const char *pInfoData)

 {

   char *pType, *pData;

@@ -257,7 +257,7 @@ void BlinkenMovieSetInfo(stBlinkenMovie *pMovie, int infoNo, char *pInfoType,

 }

 void BlinkenMovieInsertInfo(stBlinkenMovie *pMovie, int infoNo,

-                            char *pInfoType, char *pInfoData)

+                            const char *pInfoType, const char *pInfoData)

 {

   char ***pppNewInfos, *pType, *pData;

   int i;

@@ -265,7 +265,8 @@ void BlinkenMovieInsertInfo(stBlinkenMovie *pMovie, int infoNo,

   if (pMovie == NULL || infoNo < 0 || infoNo > pMovie->infoCnt)

     return;

-  pppNewInfos = (char ***)malloc2D(pMovie->infoCnt + 1, 2, sizeof(char *));

+  pppNewInfos = (char ***)BlinkenMalloc2D(pMovie->infoCnt + 1, 2,

+                                          sizeof(char *));

   if (pppNewInfos == NULL)

     return;

@@ -299,8 +300,8 @@ void BlinkenMovieInsertInfo(stBlinkenMovie *pMovie, int infoNo,

   pMovie->infoCnt++;

 }

-void BlinkenMovieAppendInfo(stBlinkenMovie *pMovie, char *pInfoType,

-                            char *pInfoData)

+void BlinkenMovieAppendInfo(stBlinkenMovie *pMovie, const char *pInfoType,

+                            const char *pInfoData)

 {

   if (pMovie == NULL)

     return;

@@ -316,7 +317,8 @@ void BlinkenMovieDeleteInfo(stBlinkenMovie *pMovie, int infoNo)

   if (pMovie == NULL || infoNo < 0 || infoNo >= pMovie->infoCnt)

     return;

-  pppNewInfos = (char ***)malloc2D(pMovie->infoCnt - 1, 2, sizeof(char *));

+  pppNewInfos = (char ***)BlinkenMalloc2D(pMovie->infoCnt - 1, 2,

+                                          sizeof(char *));

   if (pppNewInfos == NULL)

     return;

@@ -346,7 +348,7 @@ void BlinkenMovieDeleteInfos(stBlinkenMovie *pMovie)

   if (pMovie == NULL)

     return;

-  pppNewInfos = (char ***)malloc2D(0, 2, sizeof(char *));

+  pppNewInfos = (char ***)BlinkenMalloc2D(0, 2, sizeof(char *));

   if (pppNewInfos == NULL)

     return;

@@ -401,7 +403,7 @@ int BlinkenMovieInsertFrame(stBlinkenMovie *pMovie, int frameNo,

     return -1;

   ppNewFrames =

-      (stBlinkenFrame **) malloc1D(pMovie->frameCnt + 1,

+      (stBlinkenFrame **) BlinkenMalloc1D(pMovie->frameCnt + 1,

                                           sizeof(stBlinkenFrame *));

   if (ppNewFrames == NULL)

     return -1;

@@ -438,8 +440,7 @@ void BlinkenMovieDeleteFrame(stBlinkenMovie *pMovie, int frameNo)

   if (pMovie == NULL || frameNo < 0 || frameNo >= pMovie->frameCnt)

     return;

-  ppNewFrames =

-      (stBlinkenFrame **) malloc1D(pMovie->frameCnt - 1,

+  ppNewFrames = (stBlinkenFrame **)BlinkenMalloc1D(pMovie->frameCnt - 1,

                                                    sizeof(stBlinkenFrame *));

   if (ppNewFrames == NULL)

     return;

@@ -465,7 +466,8 @@ void BlinkenMovieDeleteFrames(stBlinkenMovie *pMovie)

   if (pMovie == NULL)

     return;

-  ppNewFrames = (stBlinkenFrame **) malloc1D(0, sizeof(stBlinkenFrame *));

+  ppNewFrames =

+      (stBlinkenFrame **)BlinkenMalloc1D(0, sizeof(stBlinkenFrame *));

   if (ppNewFrames == NULL)

     return;

@@ -477,10 +479,8 @@ void BlinkenMovieDeleteFrames(stBlinkenMovie *pMovie)

   pMovie->frameCnt = 0;

 }

-int BlinkenMovieConcat(stBlinkenMovie *pMovie, stBlinkenMovie *pMovie2        /* appended 

-                                                                                   and 

-                                                                                   freed 

-                                                                                 */ )

+int BlinkenMovieConcat(stBlinkenMovie *pMovie,

+                       stBlinkenMovie *pMovie2 /* appended and freed */)

 {

   stBlinkenFrame **ppNewFrames, **ppNewFrames2;

   int i;

@@ -492,11 +492,11 @@ int BlinkenMovieConcat(stBlinkenMovie *pMovie, stBlinkenMovie *pMovie2        /*

                      pMovie->maxval);

   ppNewFrames =

-      (stBlinkenFrame **) malloc1D(pMovie->frameCnt + pMovie2->frameCnt,

+      (stBlinkenFrame **)BlinkenMalloc1D(pMovie->frameCnt + pMovie2->frameCnt,

                                          sizeof(stBlinkenFrame *));

   if (ppNewFrames == NULL)

     return -1;

-  ppNewFrames2 = (stBlinkenFrame **) malloc1D(0, sizeof(stBlinkenFrame *));

+  ppNewFrames2 = (stBlinkenFrame **)BlinkenMalloc1D(0, sizeof(stBlinkenFrame *));

   if (ppNewFrames2 == NULL) {

     free(ppNewFrames);

     return -1;

@@ -691,7 +691,7 @@ char *BlinkenMovieToString(stBlinkenMovie *pMovie)

   if (pMovie == NULL)

     return NULL;

-  strs = (char **)malloc1D(pMovie->frameCnt, sizeof(char *));

+  strs = (char **)BlinkenMalloc1D(pMovie->frameCnt, sizeof(char *));

   if (strs == NULL)

     return NULL;

@@ -741,7 +741,7 @@ char *BlinkenMovieToString(stBlinkenMovie *pMovie)

   return str;

 }

-stBlinkenMovie *BlinkenMovieLoadBlm(char *pFilename)

+stBlinkenMovie *BlinkenMovieLoadBlm(const char *pFilename)

 {

   FILE *pFile;

   stBlinkenMovie *pMovie;

@@ -800,13 +800,8 @@ stBlinkenMovie *BlinkenMovieLoadBlm(char *pFilename)

     else if (fscanf(pFile, "%1[01]", pixel) == 1) {

       if (pFrame != NULL) {

         for (x = 0;; x++) {

-          BlinkenFrameSetPixel(pFrame, y, x, 0, (unsigned char)(pixel[0] == '1' ? 1 : 0));      // set 

-                                                                                                // 

-          // 

-          // 

-          // 

-          // 

-          // pixel

+          BlinkenFrameSetPixel(pFrame, y, x, 0, // set pixel

+                               (unsigned char)(pixel[0] == '1' ? 1 : 0));

           if (fscanf(pFile, "%1[01]", pixel) != 1)      // read next pixel

             break;

         }

@@ -822,7 +817,7 @@ stBlinkenMovie *BlinkenMovieLoadBlm(char *pFilename)

   return pMovie;

 }

-stBlinkenMovie *BlinkenMovieLoadBmm(char *pFilename)

+stBlinkenMovie *BlinkenMovieLoadBmm(const char *pFilename)

 {

   FILE *pFile;

   stBlinkenMovie *pMovie;

@@ -883,13 +878,8 @@ stBlinkenMovie *BlinkenMovieLoadBmm(char *pFilename)

         for (x = 0;; x++) {

           if (sscanf(pixel, "%i", &val) != 1)   // convert pixel to number

             break;

-          BlinkenFrameSetPixel(pFrame, y, x, 0, (unsigned char)val);    // set 

-                                                                        // 

-          // 

-          // 

-          // 

-          // 

-          // pixel

+          BlinkenFrameSetPixel(pFrame, y, x, 0, // set pixel

+                               (unsigned char)val);

           fscanf(pFile, "%*[ \t]");     // kill space

           if (fscanf(pFile, "%7[0-9A-FXa-fx]", pixel) != 1)     // read next

             // pixel

@@ -907,7 +897,7 @@ stBlinkenMovie *BlinkenMovieLoadBmm(char *pFilename)

   return pMovie;

 }

-stBlinkenMovie *BlinkenMovieLoadBml(char *pFilename)

+stBlinkenMovie *BlinkenMovieLoadBml(const char *pFilename)

 {

   FILE *pFile;

   stBlinkenMovie *pMovie;

@@ -972,21 +962,8 @@ stBlinkenMovie *BlinkenMovieLoadBml(char *pFilename)

         // get number of characters per channel

         chrs = (bits + 3) >> 2;

         // get fscanf formart string for reading a pixel

-        sprintf(pixelFormat, "%%%d[0-9A-Fa-f]", chrs > 4 ? 5 : chrs);   // read 

-                                                                        // 

-        // 

-        // 

-        // 

-        // 

-        // max 

-        // 5

-        // chars 

-        // (2 

-        // already 

-        // in 

-        // use 

-        // by 

-        // prefix)

+        //   read max 5 chars (2 already in use by prefix)

+        sprintf(pixelFormat, "%%%d[0-9A-Fa-f]", chrs > 4 ? 5 : chrs);

         // initialize pixel buffer with hex prefix

         strcpy(pixel, "0x");

       }

@@ -1085,7 +1062,7 @@ stBlinkenMovie *BlinkenMovieLoadBml(char *pFilename)

   return pMovie;

 }

-stBlinkenMovie *BlinkenMovieLoadBbm(char *pFilename)

+stBlinkenMovie *BlinkenMovieLoadBbm(const char *pFilename)

 {

   FILE *pFile;

   stBlinkenMovie *pMovie;

@@ -1255,14 +1232,14 @@ stBlinkenMovie *BlinkenMovieLoadBbm(char *pFilename)

 #ifdef BLINKENLIB_CFG_MNG

-stBlinkenMovie *BlinkenMovieLoadMng(char *pFilename)

+stBlinkenMovie *BlinkenMovieLoadMng(const char *pFilename)

 {

   return BlinkenMngLoad(pFilename);

 }

 #endif // #ifdef BLINKENLIB_CFG_MNG

-stBlinkenMovie *BlinkenMovieLoad(char *pFilename)

+stBlinkenMovie *BlinkenMovieLoad(const char *pFilename)

 {

   int len;

@@ -1285,7 +1262,7 @@ stBlinkenMovie *BlinkenMovieLoad(char *pFilename)

   return NULL;

 }

-int BlinkenMovieSaveBlm(stBlinkenMovie *pMovie, char *pFilename)

+int BlinkenMovieSaveBlm(stBlinkenMovie *pMovie, const char *pFilename)

 {

   stBlinkenMovie *pOutMovie;

   FILE *pFile;

@@ -1340,7 +1317,7 @@ int BlinkenMovieSaveBlm(stBlinkenMovie *pMovie, char *pFilename)

   return 0;

 }

-int BlinkenMovieSaveBmm(stBlinkenMovie *pMovie, char *pFilename)

+int BlinkenMovieSaveBmm(stBlinkenMovie *pMovie, const char *pFilename)

 {

   stBlinkenMovie *pOutMovie;

   FILE *pFile;

@@ -1394,7 +1371,7 @@ int BlinkenMovieSaveBmm(stBlinkenMovie *pMovie, char *pFilename)

   return 0;

 }

-int BlinkenMovieSaveBml(stBlinkenMovie *pMovie, char *pFilename)

+int BlinkenMovieSaveBml(stBlinkenMovie *pMovie, const char *pFilename)

 {

   stBlinkenMovie *pOutMovie;

   FILE *pFile;

@@ -1477,7 +1454,7 @@ int BlinkenMovieSaveBml(stBlinkenMovie *pMovie, char *pFilename)

   return 0;

 }

-int BlinkenMovieSaveBbm(stBlinkenMovie *pMovie, char *pFilename)

+int BlinkenMovieSaveBbm(stBlinkenMovie *pMovie, const char *pFilename)

 {

   unsigned char *pFrameData;

   FILE *pFile;

@@ -1596,14 +1573,14 @@ int BlinkenMovieSaveBbm(stBlinkenMovie *pMovie, char *pFilename)

 #ifdef BLINKENLIB_CFG_MNG

-int BlinkenMovieSaveMng(stBlinkenMovie *pMovie, char *pFilename)

+int BlinkenMovieSaveMng(stBlinkenMovie *pMovie, const char *pFilename)

 {

   return BlinkenMngSave(pMovie, pFilename);

 }

 #endif // #ifdef BLINKENLIB_CFG_MNG

-int BlinkenMovieSave(stBlinkenMovie *pMovie, char *pFilename)

+int BlinkenMovieSave(stBlinkenMovie *pMovie, const char *pFilename)

 {

   int len;

@@ -1681,14 +1658,8 @@ stBlinkenMovie *BlinkenMovieReceive(SOCKET udpSocket, int timeout,

     FD_SET(udpSocket, &readFds);

     timeo.tv_sec = timeout / 1000;

     timeo.tv_usec = (timeout % 1000) * 1000;

-    if (select(udpSocket + 1, &readFds, NULL, NULL, &timeo) <= 0)       // timeout 

-                                                                        // 

-      // 

-      // 

-      // 

-      // 

-      // or 

-      // error

+    // timeout or error

+    if (select(udpSocket + 1, &readFds, NULL, NULL, &timeo) <= 0)

       break;

     // fetch data

@@ -15,6 +15,10 @@

 #define INVALID_SOCKET -1

 #endif

+#ifdef __cplusplus

+extern "C" {

+#endif

+

 typedef struct sBlinkenMovie stBlinkenMovie;

 stBlinkenMovie *BlinkenMovieNew(int height, int width, int channels,

@@ -33,12 +37,12 @@ int BlinkenMovieGetDuration(stBlinkenMovie *pMovie);

 int BlinkenMovieGetInfoCnt(stBlinkenMovie *pMovie);

 char *BlinkenMovieGetInfoType(stBlinkenMovie *pMovie, int infoNo);

 char *BlinkenMovieGetInfoData(stBlinkenMovie *pMovie, int infoNo);

-void BlinkenMovieSetInfo(stBlinkenMovie *pMovie, int infoNo, char *pInfoType,

-                         char *pInfoData);

+void BlinkenMovieSetInfo(stBlinkenMovie *pMovie, int infoNo,

+                         const char *pInfoType, const char *pInfoData);

 void BlinkenMovieInsertInfo(stBlinkenMovie *pMovie, int infoNo,

-                            char *pInfoType, char *pInfoData);

-void BlinkenMovieAppendInfo(stBlinkenMovie *pMovie, char *pInfoType,

-                            char *pInfoData);

+                            const char *pInfoType, const char *pInfoData);

+void BlinkenMovieAppendInfo(stBlinkenMovie *pMovie, const char *pInfoType,

+                            const char *pInfoData);

 void BlinkenMovieDeleteInfo(stBlinkenMovie *pMovie, int infoNo);

 void BlinkenMovieDeleteInfos(stBlinkenMovie *pMovie);

@@ -52,10 +56,8 @@ int BlinkenMovieAppendFrame(stBlinkenMovie *pMovie, stBlinkenFrame *pFrame);

 void BlinkenMovieDeleteFrame(stBlinkenMovie *pMovie, int frameNo);

 void BlinkenMovieDeleteFrames(stBlinkenMovie *pMovie);

-int BlinkenMovieConcat(stBlinkenMovie *pMovie, stBlinkenMovie *pMovie2        /* appended 

-                                                                                   and 

-                                                                                   freed 

-                                                                                 */ );

+int BlinkenMovieConcat(stBlinkenMovie *pMovie,

+                       stBlinkenMovie *pMovie2 /* appended and freed */);

 void BlinkenMovieReverse(stBlinkenMovie *pMovie);

 void BlinkenMovieResize(stBlinkenMovie *pMovie, int height, int width,

@@ -68,23 +70,23 @@ void BlinkenMovieCopyRect(stBlinkenMovie *pDest, int destY, int destX,

 char *BlinkenMovieToString(stBlinkenMovie *pMovie);

-stBlinkenMovie *BlinkenMovieLoadBlm(char *pFilename);

-stBlinkenMovie *BlinkenMovieLoadBmm(char *pFilename);

-stBlinkenMovie *BlinkenMovieLoadBml(char *pFilename);

-stBlinkenMovie *BlinkenMovieLoadBbm(char *pFilename);

+stBlinkenMovie *BlinkenMovieLoadBlm(const char *pFilename);

+stBlinkenMovie *BlinkenMovieLoadBmm(const char *pFilename);

+stBlinkenMovie *BlinkenMovieLoadBml(const char *pFilename);

+stBlinkenMovie *BlinkenMovieLoadBbm(const char *pFilename);

 #ifdef BLINKENLIB_CFG_MNG

-stBlinkenMovie *BlinkenMovieLoadMng(char *pFilename);

+stBlinkenMovie *BlinkenMovieLoadMng(const char *pFilename);

 #endif // #ifdef BLINKENLIB_CFG_MNG

-stBlinkenMovie *BlinkenMovieLoad(char *pFilename);

+stBlinkenMovie *BlinkenMovieLoad(const char *pFilename);

-int BlinkenMovieSaveBlm(stBlinkenMovie *pMovie, char *pFilename);

-int BlinkenMovieSaveBmm(stBlinkenMovie *pMovie, char *pFilename);

-int BlinkenMovieSaveBml(stBlinkenMovie *pMovie, char *pFilename);

-int BlinkenMovieSaveBbm(stBlinkenMovie *pMovie, char *pFilename);

+int BlinkenMovieSaveBlm(stBlinkenMovie *pMovie, const char *pFilename);

+int BlinkenMovieSaveBmm(stBlinkenMovie *pMovie, const char *pFilename);

+int BlinkenMovieSaveBml(stBlinkenMovie *pMovie, const char *pFilename);

+int BlinkenMovieSaveBbm(stBlinkenMovie *pMovie, const char *pFilename);

 #ifdef BLINKENLIB_CFG_MNG

-int BlinkenMovieSaveMng(stBlinkenMovie *pMovie, char *pFilename);

+int BlinkenMovieSaveMng(stBlinkenMovie *pMovie, const char *pFilename);

 #endif // #ifdef BLINKENLIB_CFG_MNG

-int BlinkenMovieSave(stBlinkenMovie *pMovie, char *pFilename);

+int BlinkenMovieSave(stBlinkenMovie *pMovie, const char *pFilename);

 void BlinkenMovieSend(stBlinkenMovie *pMovie, SOCKET udpSocket,

                       etBlinkenProto proto, int maxidle);

@@ -98,4 +100,8 @@ stBlinkenMovie *BlinkenMovieReceive(SOCKET udpSocket, int timeout,

 // after timeout ms of no reception, the movie is considered to be complete

 // returns protocol in *pProto if pProto not NULL

+#ifdef __cplusplus

+} // extern "C"

+#endif

+

 #endif // #ifndef INC_BlinkenLib_BlinkenMovie

@@ -6,7 +6,7 @@

 #include <BlinkenLib/Tools.h>

-void *malloc1D(int count1, int size)

+void *BlinkenMalloc1D(int count1, int size)

 {

   if (count1 < 1)

     count1 = 1;

@@ -16,7 +16,7 @@ void *malloc1D(int count1, int size)

   return malloc(count1 * size);

 }

-void **malloc2D(int count1, int count2, int size)

+void **BlinkenMalloc2D(int count1, int count2, int size)

 {

   int sz, i;

   char *p;

@@ -17,8 +17,16 @@

 #define arr_cnt( arr ) (sizeof( (arr) ) / sizeof( (arr)[0] ))

 #endif

-void *malloc1D(int count1, int size);

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+void *BlinkenMalloc1D(int count1, int size);

-void **malloc2D(int count1, int count2, int size);

+void **BlinkenMalloc2D(int count1, int count2, int size);

+

+#ifdef __cplusplus

+} // extern "C"

+#endif

 #endif // #ifndef INC_BlinkenLib_Tools

@@ -1,3 +1,7 @@

+0.6.8 2011-10-22

+----------------

+adpations for usage in C++ code

+

 0.6.7 2011-10-16

 ----------------

 added copying rectangular section to BlinkenConv

@@ -1,5 +1,5 @@

 VERSION_MAJOR=0

 VERSION_MINOR=6

-VERSION_REVISION=7

+VERSION_REVISION=8

 VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)