Revert "some more fixes towards binary compatibility"

This reverts commit a8c5e35619.

Conflicts:
	modules/imgproc/src/imgwarp.cpp

modules/ml/include/opencv2/ml/ml.hpp

@@ -2069,7 +2069,6 @@ protected:
 
     char delimiter;
     char miss_ch;
-    short header_lines_number;
     //char flt_separator;
 
     CvMat* values;
@@ -2094,6 +2093,8 @@ protected:
     int* sample_idx; // data of train_sample_idx and test_sample_idx
 
     cv::RNG* rng;
+    
+    int header_lines_number;
 };
 
 

modules/ml/src/data.cpp

@@ -121,7 +121,7 @@ void CvMLData::clear()
 
 void CvMLData::set_header_lines_number( int idx )
 {
-	header_lines_number = (short)std::max(0, idx);
+	header_lines_number = std::max(0, idx);
 }
 
 int CvMLData::get_header_lines_number() const