Changeset 38461

Timestamp:

Jun 12, 2015, 10:25:10 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM branch ipp-20150419

Location:

trunk/Ohana/src/libkapa

Files:

• include/kapa.h (modified) (1 diff)
• src/KiiPicture.c (modified) (1 diff)

trunk/Ohana/src/libkapa/include/kapa.h

@@ -146 +146 @@
 int KiiSetChannel (int fd, int channel);
 int KiiSetColormap (int fd, char *colormap);
+int KiiSetNanColor (int fd, int red, int green, int blue);
 int KiiNewPicture1D (int fd, KiiImage *image, KapaImageData *data, Coords *coords);
 int KiiNewPicture2D (int fd, KiiImage *image, KapaImageData *data, Coords *coords);

trunk/Ohana/src/libkapa/src/KiiPicture.c

@@ -14 +14 @@
   KiiSendCommand (fd, 4, "CMAP"); /* tell kapa to look for the incoming image */
   KiiSendMessage (fd, "%s", colormap);
+  
+  KiiWaitAnswer (fd, "DONE");
+  return (TRUE);
+}
+
+int KiiSetNanColor (int fd, int red, int green, int blue) {
+
+  KiiSendCommand (fd, 4, "CNAN"); /* tell kapa to look for the incoming image */
+  KiiSendMessage (fd, "%d %d %d ", red, green, blue);
   
   KiiWaitAnswer (fd, "DONE");