Merged the trunk r8547:8574, r8587

2012-06-15 08:36:35 +00:00
parent 4b1724aeb9
commit ab20da0f53
12 changed files with 133 additions and 33 deletions
--- a/samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
+++ b/samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
@@ -44,8 +44,8 @@ int main( int argc, char** argv )
    int histSize[] = { h_bins, s_bins };

    // hue varies from 0 to 256, saturation from 0 to 180
-    float h_ranges[] = { 0, 256 };
-    float s_ranges[] = { 0, 180 };
+    float s_ranges[] = { 0, 256 };
+    float h_ranges[] = { 0, 180 };

    const float* ranges[] = { h_ranges, s_ranges };