removed hard coding height and width

Author: sghoshcvc

modules/text/CMakeLists.txt

@@ -59,8 +59,10 @@ if(HAVE_CAFFE AND HAVE_GLOG AND HAVE_PROTOBUF)
   list(APPEND Caffe_LINKER_LIBS ${HDF5_LIBRARIES})
   find_package(Boost 1.46 REQUIRED COMPONENTS system thread filesystem)
   include_directories(SYSTEM ${Boost_INCLUDE_DIR})
-  include_directories(SYSTEM /usr/local/cuda-8.0/targets/x86_64-linux/include/ usr/local/cuda-8.0/include/ /usr/local/cuda-7.5/targets/x86_64-linux/include/ )
-  link_directories(SYSTEM /usr/local/cuda-8.0/targets/x86_64-linux/lib/ usr/local/cuda-8.0/lib/ /usr/local/cuda-7.5/targets/x86_64-linux/lib/ /usr/lib/openblas-base/lib /usr/local/cuda-8.0/lib64)
+  include_directories(SYSTEM ${CUDA_INCLUDE_DIR})
+  link_directories(SYSTEM ${CUDA_LIBS})
+ # include_directories(SYSTEM /usr/local/cuda-8.0/targets/x86_64-linux/include/ usr/local/cuda-8.0/include/ /usr/local/cuda-7.5/targets/x86_64-linux/include/ )
+  #link_directories(SYSTEM /usr/local/cuda-8.0/targets/x86_64-linux/lib/ usr/local/cuda-8.0/lib/ /usr/local/cuda-7.5/targets/x86_64-linux/lib/ /usr/lib/openblas-base/lib /usr/local/cuda-8.0/lib64)
   list(APPEND Caffe_LINKER_LIBS ${Boost_LIBRARIES})
   target_link_libraries(opencv_text atlas blas ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} ${HDF5_LIBRARIES} ${Boost_LIBRARIES})
   add_definitions(-DHAVE_CAFFE)

modules/text/src/ocr_holistic.cpp

@@ -271,9 +271,9 @@ class DeepCNNOpenCvDNNImpl: public DeepCNN{
     //Size outputGeometry_;//= Size(1,1);
     //int channelCount_;
    // int inputChannel_ ;//=1;
-    const int _inputHeight =32;
-    const int _inputWidth =100;
-    const int _inputChannel =1;
+    //const int _inputHeight =32;
+    //const int _inputWidth =100;
+    //const int _inputChannel =1;
 public:
     DeepCNNOpenCvDNNImpl(const DeepCNNOpenCvDNNImpl& dn):
         minibatchSz_(dn.minibatchSz_),outputSize_(dn.outputSize_){
@@ -300,8 +300,8 @@ class DeepCNNOpenCvDNNImpl: public DeepCNN{
         //Implemented to supress Visual Studio warning "assignment operator could not be generated"
     }
 
-    DeepCNNOpenCvDNNImpl(String modelArchFilename, String modelWeightsFilename,Ptr<ImagePreprocessor> preprocessor, int maxMinibatchSz)
-        :minibatchSz_(maxMinibatchSz)
+    DeepCNNOpenCvDNNImpl(String modelArchFilename, String modelWeightsFilename,Ptr<ImagePreprocessor> preprocessor, int maxMinibatchSz,int inputWidth =100,int inputHeight = 32)
+        :minibatchSz_(maxMinibatchSz),_inputWidth(inputWidth),_inputHeight(inputHeight)
     {
 
         CV_Assert(this->minibatchSz_>0);
@@ -612,13 +612,13 @@ class OCRHolisticWordRecognizerImpl: public OCRHolisticWordRecognizer{
         this->classifier_->classifyBatch(inputImageList,netOutput);
 
         for(int k=0;k<netOutput.rows;k++)
-        {
+        {https://www.google.es/?gfe_rd=cr&dcr=0&ei=4fq7We8Bk9jyB8zPp5AL
             int classNum;
             double confidence;
             NetOutput::getClassification((float*)(netOutput.row(k).data),this->classifier_->getOutputSize(),classNum,confidence);
             transcriptionVec.push_back(this->labels_[classNum]);
             confidenceVec.push_back(confidence);
-        }
+        }https://www.google.es/?gfe_rd=cr&dcr=0&ei=4fq7We8Bk9jyB8zPp5AL
     }