mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9728 from huningxin:fix_9727

Browse Source
This commit is contained in:
Alexander Alekhin 2017-09-27 12:05:55 +00:00
commit d4c905bf77
62 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/js_tutorials/js_assets/js_basic_ops_copymakeborder.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_basic_ops_roi.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_canny.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_colorspaces_cvtColor.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_colorspaces_inRange.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_contour_features_approxPolyDP.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_contour_features_area.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<p><strong>The area is: </strong><span id="areaOutput"></span></p>

2
doc/js_tutorials/js_assets/js_contour_features_boundingRect.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_contour_features_convexHull.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_contour_features_fitEllipse.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_contour_features_fitLine.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_contour_features_minAreaRect.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_contour_features_minEnclosingCircle.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_contour_features_moments.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<p><strong>The m00 is: </strong><span id="momentsOutput"></span></p>

2
doc/js_tutorials/js_assets/js_contour_features_perimeter.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<p><strong>The perimeter is: </strong><span id="perimeterOutput"></span></p>

2
doc/js_tutorials/js_assets/js_contour_properties_transpose.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_contours_begin_contours.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_contours_more_functions_convexityDefects.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_contours_more_functions_shape.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_face_detection.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_filtering_GaussianBlur.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_filtering_bilateralFilter.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_filtering_blur.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_filtering_filter.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_filtering_medianBlur.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_fourier_transform_dft.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_geometric_transformations_getAffineTransform.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_geometric_transformations_resize.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_geometric_transformations_rotateWarpAffine.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_geometric_transformations_warpAffine.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_geometric_transformations_warpPerspective.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_grabcut_grabCut.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_gradients_Laplacian.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_gradients_Sobel.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutputx"></canvas>

2
doc/js_tutorials/js_assets/js_gradients_absSobel.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput8U"></canvas>

2
doc/js_tutorials/js_assets/js_histogram_begins_calcHist.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_histogram_equalization_createCLAHE.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_histogram_equalization_equalizeHist.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_houghcircles_HoughCirclesP.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_houghlines_HoughLines.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_houghlines_HoughLinesP.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_image_display.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_morphological_ops_blackHat.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_morphological_ops_closing.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_morphological_ops_dilate.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_morphological_ops_erode.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_morphological_ops_getStructuringElement.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_morphological_ops_gradient.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_morphological_ops_opening.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_morphological_ops_topHat.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_pyramids_pyrDown.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_pyramids_pyrUp.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_setup_usage.html
View File

@ -11,7 +11,7 @@
<div>
<div class="inputoutput">
<img id="imageSrc" alt="No Image" />
<div class="caption">imageSrc <input type="file" id="fileInput" name="file" /></div>
<div class="caption">imageSrc <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput" ></canvas>

2
doc/js_tutorials/js_assets/js_template_matching_matchTemplate.html
View File

@ -22,7 +22,7 @@
<div>
<div class="inputoutput">
<canvas id="imageCanvasInput"></canvas>
<div class="caption">imageCanvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">imageCanvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="templateCanvasInput"></canvas>

2
doc/js_tutorials/js_assets/js_thresholding_adaptiveThreshold.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_thresholding_threshold.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_watershed_background.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_watershed_distanceTransform.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_watershed_foreground.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_watershed_threshold.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

2
doc/js_tutorials/js_assets/js_watershed_watershed.html
View File

@ -21,7 +21,7 @@
<div>
<div class="inputoutput">
<canvas id="canvasInput"></canvas>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" /></div>
<div class="caption">canvasInput <input type="file" id="fileInput" name="file" accept="image/*" /></div>
</div>
<div class="inputoutput">
<canvas id="canvasOutput"></canvas>

9
doc/js_tutorials/js_assets/utils.js
View File

@ -12,7 +12,7 @@ function Utils(errorOutputId) { // eslint-disable-line no-unused-vars
onloadCallback();
});
script.addEventListener('error', () => {
this.printError('Failed to load ' + OPENCV_URL);
self.printError('Failed to load ' + OPENCV_URL);
});
script.src = OPENCV_URL;
let node = document.getElementsByTagName('script')[0];
@ -98,8 +98,11 @@ function Utils(errorOutputId) { // eslint-disable-line no-unused-vars
this.addFileInputHandler = function(fileInputId, canvasId) {
let inputElement = document.getElementById(fileInputId);
inputElement.addEventListener('change', (e) => {
let imgUrl = URL.createObjectURL(e.target.files[0]);
loadImageToCanvas(imgUrl, canvasId);
let files = e.target.files;
if (files.length > 0) {
let imgUrl = URL.createObjectURL(files[0]);
self.loadImageToCanvas(imgUrl, canvasId);
}
}, false);
};