Changeset 124 in flair-src for trunk/lib/FlairVisionFilter

Timestamp:

Jan 12, 2017, 10:39:23 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs jpeg

Location:

trunk/lib/FlairVisionFilter/src

Files:

• CvtColor.cpp (modified) (2 diffs)
• CvtColor.h (modified) (1 diff)
• HoughLines.cpp (modified) (1 diff)
• ImgThreshold.cpp (modified) (1 diff)
• Sobel.cpp (modified) (1 diff)
• VisionFilter.cpp (modified) (1 diff)
• VisionFilter.h (modified) (1 diff)
• unexported/compile_info.h (modified) (1 diff)

trunk/lib/FlairVisionFilter/src/CvtColor.cpp

@@ -25 +25 @@
 
     switch(conversion) {
-    case Conversion_t::GRAY:
+    case Conversion_t::ToGray:
         try{
             cvimage::Type const &imageType=dynamic_cast<cvimage::Type const &>(parent->GetOutputDataType());
-            output=new cvimage(this,imageType.GetWidth(),imageType.GetHeight(),cvimage::Type::Format::GRAY,"conversion",true,2);
+            output=new cvimage(this,imageType.GetWidth(),imageType.GetHeight(),cvimage::Type::Format::Gray,"conversion",true,2);
 
         } catch(std::bad_cast& bc) {
@@ -61 +61 @@
 
     switch(conversion) {
-    case Conversion_t::GRAY:
+    case Conversion_t::ToGray:
         switch(((cvimage*)data)->GetDataType().GetFormat()) {
         case cvimage::Type::Format::YUYV:

trunk/lib/FlairVisionFilter/src/CvtColor.h

@@ -39 +39 @@
             */
             enum class Conversion_t {
-                BGR,/*!< BGR 24 bits */
-                GRAY,/*!< gray 8 bits */
+                ToBGR,/*!< BGR 24 bits */
+                ToGray,/*!< gray 8 bits */
                 } ;
 

trunk/lib/FlairVisionFilter/src/HoughLines.cpp

@@ -53 +53 @@
     try{
         cvimage::Type const &imageType=dynamic_cast<cvimage::Type const &>(parent->GetOutputDataType());
-        if(imageType.GetFormat()!=cvimage::Type::Format::GRAY) {
-            Err("input image is not grey\n");
+        if(imageType.GetFormat()!=cvimage::Type::Format::Gray) {
+            Err("input image is not gray\n");
         }
     } catch(std::bad_cast& bc) {

trunk/lib/FlairVisionFilter/src/ImgThreshold.cpp

@@ -32 +32 @@
     try{
         cvimage::Type const &imageType=dynamic_cast<cvimage::Type const &>(parent->GetOutputDataType());
-        if(imageType.GetFormat()==cvimage::Type::Format::GRAY) {
+        if(imageType.GetFormat()==cvimage::Type::Format::Gray) {
             output=new cvimage(this,imageType.GetWidth(),imageType.GetHeight(),imageType.GetFormat(),"threshold");
         } else {
-            Err("input image is not grey\n");
+            Err("input image is not gray\n");
         }
     } catch(std::bad_cast& bc) {

trunk/lib/FlairVisionFilter/src/Sobel.cpp

@@ -34 +34 @@
     try{
         cvimage::Type const &imageType=dynamic_cast<cvimage::Type const &>(parent->GetOutputDataType());
-        if(imageType.GetFormat()==cvimage::Type::Format::GRAY) {
+        if(imageType.GetFormat()==cvimage::Type::Format::Gray) {
             output=new cvimage(this,imageType.GetWidth(),imageType.GetHeight(),imageType.GetFormat(),"sobel");
         } else {
-            Err("input image is not grey\n");
+            Err("input image is not gray\n");
         }
 

trunk/lib/FlairVisionFilter/src/VisionFilter.cpp

@@ -9 +9 @@
 }
 
-void saveToJpeg(IplImage* src_img,std::string filename,unsigned char compression_level) {
+void saveToJpeg(IplImage* src_img,std::string filename,PictureFormat_t input_format,PictureFormat_t output_format,unsigned char compression_level) {
         if(!cvSaveImage(filename.c_str(),src_img)) printf("Could not save.\n");
 }

trunk/lib/FlairVisionFilter/src/VisionFilter.h

@@ -12 +12 @@
 void CloseVisionFilter(void);
 
-void saveToJpeg(IplImage* src_img,std::string filename,unsigned char compression_level=95);
+enum class PictureFormat_t {
+                Gray,/*!< gray 8 bits */
+                                                                RGB,/*!< rgb 24 bits */
+                                                                UYVY,/*!< YUV 4:2:2 planer */
+                } ;
+                                                                
+void saveToJpeg(IplImage* src_img,std::string filename,PictureFormat_t input_format,PictureFormat_t output_format,unsigned char compression_level=95);

trunk/lib/FlairVisionFilter/src/unexported/compile_info.h

@@ -5 +5 @@
 
 #define USER "gsanahuj@gsanahuj-Latitude-E6420"
-#define DATE "mardi 10 janvier 2017, 15:56:33 (UTC+0100)"
+#define DATE "jeudi 12 janvier 2017, 09:32:25 (UTC+0100)"
 #define GCC_REV "4.9.1"
 #define GCC_PATH "/opt/robomap3/1.7.3/armv7a-neon/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-gcc"
 #define SVN_PATH "/home/gsanahuj/HDS/igep/flair-src_svn/trunk/lib/FlairVisionFilter"
-#define SVN_REV "122M"
+#define SVN_REV "122:123M"
 
 inline void compile_info(std::string name) {