Add remaining intrinsics to C++ API.

Change-Id: Ife427f5c040242c5fb639be54fb8131cd5712d01
(cherry picked from commit 02b6367ae84f07bfeedea59247fdc45950ed5dd6)
diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h
index b85499c..dae84ce 100644
--- a/cpp/rsCppStructs.h
+++ b/cpp/rsCppStructs.h
@@ -660,6 +660,7 @@
 class ScriptIntrinsic : public Script {
  protected:
     ScriptIntrinsic(sp<RS> rs, int id, sp<const Element> e);
+    virtual ~ScriptIntrinsic();
 };
 
 class ScriptIntrinsic3DLUT : public ScriptIntrinsic {
@@ -723,17 +724,40 @@
     void setCoefficients(float* v);
 };
 
-/*class ScriptIntrinsicLUT : public ScriptIntrinsic {
+class ScriptIntrinsicHistogram : public ScriptIntrinsic {
+ public:
+    ScriptIntrinsicHistogram(sp<RS> rs, sp<const Element> e);
+    void setOutput(sp<Allocation> aout);
+    void setDotCoefficients(float r, float g, float b, float a);
+    void forEach(sp<Allocation> ain);
+    void forEach_dot(sp<Allocation> ain);
+};
+
+class ScriptIntrinsicLUT : public ScriptIntrinsic {
+ private:
+    sp<Allocation> LUT;
+    bool mDirty;
+    unsigned char mCache[1024];
+    void setTable(unsigned int offset, unsigned char base, unsigned char length, unsigned char* lutValues);
+
  public:
     ScriptIntrinsicLUT(sp<RS> rs, sp<const Element> e);
     void forEach(sp<Allocation> ain, sp<Allocation> aout);
-    void setLUT(sp<Allocation> lut);
-    };*/
-/*
+    void setRed(unsigned char base, unsigned char length, unsigned char* lutValues);
+    void setGreen(unsigned char base, unsigned char length, unsigned char* lutValues);
+    void setBlue(unsigned char base, unsigned char length, unsigned char* lutValues);
+    void setAlpha(unsigned char base, unsigned char length, unsigned char* lutValues);
+    virtual ~ScriptIntrinsicLUT();
+};
+
 class ScriptIntrinsicYuvToRGB : public ScriptIntrinsic {
+ public:
+    ScriptIntrinsicYuvToRGB(sp<RS> rs, sp<const Element> e);
+    void setInput(sp<Allocation> in);
+    void forEach(sp<Allocation> out);
 
 };
-*/
+
 
  class Sampler : public BaseObj {
  private: