generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing more compile problems with Java bindings etc

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-08-14 13:48:52 +04:00
parent 4530c7ad08
commit 00b2124876
27 changed files with 372 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Processor.java
View File

@@ -63,7 +63,7 @@ public class Puzzle15Processor {
}
for (int i = 0; i < GRID_AREA; i++) {
Size s = Core.getTextSize(Integer.toString(i + 1), 3/* CV_FONT_HERSHEY_COMPLEX */, 1, 2, null);
Size s = Imgproc.getTextSize(Integer.toString(i + 1), 3/* CV_FONT_HERSHEY_COMPLEX */, 1, 2, null);
mTextHeights[i] = (int) s.height;
mTextWidths[i] = (int) s.width;
}
@@ -98,7 +98,7 @@ public class Puzzle15Processor {
else {
cells[idx].copyTo(mCells15[i]);
if (mShowTileNumbers) {
Core.putText(mCells15[i], Integer.toString(1 + idx), new Point((cols / GRID_SIZE - mTextWidths[idx]) / 2,
Imgproc.putText(mCells15[i], Integer.toString(1 + idx), new Point((cols / GRID_SIZE - mTextWidths[idx]) / 2,
(rows / GRID_SIZE + mTextHeights[idx]) / 2), 3/* CV_FONT_HERSHEY_COMPLEX */, 1, new Scalar(255, 0, 0, 255), 2);
}
}
@@ -160,8 +160,8 @@ public class Puzzle15Processor {
private void drawGrid(int cols, int rows, Mat drawMat) {
for (int i = 1; i < GRID_SIZE; i++) {
Core.line(drawMat, new Point(0, i * rows / GRID_SIZE), new Point(cols, i * rows / GRID_SIZE), new Scalar(0, 255, 0, 255), 3);
Core.line(drawMat, new Point(i * cols / GRID_SIZE, 0), new Point(i * cols / GRID_SIZE, rows), new Scalar(0, 255, 0, 255), 3);
Imgproc.line(drawMat, new Point(0, i * rows / GRID_SIZE), new Point(cols, i * rows / GRID_SIZE), new Scalar(0, 255, 0, 255), 3);
Imgproc.line(drawMat, new Point(i * cols / GRID_SIZE, 0), new Point(i * cols / GRID_SIZE, rows), new Scalar(0, 255, 0, 255), 3);
}
}

2
samples/android/camera-calibration/src/org/opencv/samples/cameracalibration/CameraCalibrator.java
View File

@@ -139,7 +139,7 @@ public class CameraCalibrator {
private void renderFrame(Mat rgbaFrame) {
drawPoints(rgbaFrame);
Core.putText(rgbaFrame, "Captured: " + mCornersBuffer.size(), new Point(rgbaFrame.cols() / 3 * 2, rgbaFrame.rows() * 0.1),
Imgproc.putText(rgbaFrame, "Captured: " + mCornersBuffer.size(), new Point(rgbaFrame.cols() / 3 * 2, rgbaFrame.rows() * 0.1),
Core.FONT_HERSHEY_SIMPLEX, 1.0, new Scalar(255, 255, 0));
}

6
samples/android/camera-calibration/src/org/opencv/samples/cameracalibration/OnCameraFrameRender.java
View File

@@ -80,11 +80,11 @@ class ComparisonFrameRender extends FrameRender {
final int shift = (int)(mWidth * 0.005);
border.add(new MatOfPoint(new Point(mWidth / 2 - shift, 0), new Point(mWidth / 2 + shift, 0),
new Point(mWidth / 2 + shift, mHeight), new Point(mWidth / 2 - shift, mHeight)));
Core.fillPoly(comparisonFrame, border, new Scalar(255, 255, 255));
Imgproc.fillPoly(comparisonFrame, border, new Scalar(255, 255, 255));
Core.putText(comparisonFrame, mResources.getString(R.string.original), new Point(mWidth * 0.1, mHeight * 0.1),
Imgproc.putText(comparisonFrame, mResources.getString(R.string.original), new Point(mWidth * 0.1, mHeight * 0.1),
Core.FONT_HERSHEY_SIMPLEX, 1.0, new Scalar(255, 255, 0));
Core.putText(comparisonFrame, mResources.getString(R.string.undistorted), new Point(mWidth * 0.6, mHeight * 0.1),
Imgproc.putText(comparisonFrame, mResources.getString(R.string.undistorted), new Point(mWidth * 0.6, mHeight * 0.1),
Core.FONT_HERSHEY_SIMPLEX, 1.0, new Scalar(255, 255, 0));
return comparisonFrame;

2
samples/android/face-detection/src/org/opencv/samples/facedetect/FdActivity.java
View File

@@ -193,7 +193,7 @@ public class FdActivity extends Activity implements CvCameraViewListener2 {
Rect[] facesArray = faces.toArray();
for (int i = 0; i < facesArray.length; i++)
Core.rectangle(mRgba, facesArray[i].tl(), facesArray[i].br(), FACE_RECT_COLOR, 3);
Imgproc.rectangle(mRgba, facesArray[i].tl(), facesArray[i].br(), FACE_RECT_COLOR, 3);
return mRgba;
}

7
samples/android/hello-android/main.cpp
View File

@@ -1,6 +1,7 @@
#include <opencv2/core/core.hpp>
#include <opencv2/imgcodecs/imgcodecs.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp>
#include <opencv2/imgcodecs.hpp>
#include <opencv2/highgui.hpp>
using namespace cv;
const char* message = "Hello Android!";

8
samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
View File

@@ -231,7 +231,7 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView
mP1.x = mP2.x = offset + (c * (mHistSizeNum + 10) + h) * thikness;
mP1.y = sizeRgba.height-1;
mP2.y = mP1.y - 2 - (int)mBuff[h];
Core.line(rgba, mP1, mP2, mColorsRGB[c], thikness);
Imgproc.line(rgba, mP1, mP2, mColorsRGB[c], thikness);
}
}
// Value and Hue
@@ -244,7 +244,7 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView
mP1.x = mP2.x = offset + (3 * (mHistSizeNum + 10) + h) * thikness;
mP1.y = sizeRgba.height-1;
mP2.y = mP1.y - 2 - (int)mBuff[h];
Core.line(rgba, mP1, mP2, mWhilte, thikness);
Imgproc.line(rgba, mP1, mP2, mWhilte, thikness);
}
// Hue
Imgproc.calcHist(Arrays.asList(mIntermediateMat), mChannels[0], mMat0, hist, mHistSize, mRanges);
@@ -254,7 +254,7 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView
mP1.x = mP2.x = offset + (4 * (mHistSizeNum + 10) + h) * thikness;
mP1.y = sizeRgba.height-1;
mP2.y = mP1.y - 2 - (int)mBuff[h];
Core.line(rgba, mP1, mP2, mColorsHue[h], thikness);
Imgproc.line(rgba, mP1, mP2, mColorsHue[h], thikness);
}
break;
@@ -287,7 +287,7 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView
Mat mZoomWindow = rgba.submat(rows / 2 - 9 * rows / 100, rows / 2 + 9 * rows / 100, cols / 2 - 9 * cols / 100, cols / 2 + 9 * cols / 100);
Imgproc.resize(mZoomWindow, zoomCorner, zoomCorner.size());
Size wsize = mZoomWindow.size();
Core.rectangle(mZoomWindow, new Point(1, 1), new Point(wsize.width - 2, wsize.height - 2), new Scalar(255, 0, 0, 255), 2);
Imgproc.rectangle(mZoomWindow, new Point(1, 1), new Point(wsize.width - 2, wsize.height - 2), new Scalar(255, 0, 0, 255), 2);
zoomCorner.release();
mZoomWindow.release();
break;

1
samples/cpp/em.cpp
View File

@@ -1,4 +1,5 @@
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/ml.hpp"
using namespace cv;

2
samples/java/sbt/src/main/java/DetectFaceDemo.java
View File

@@ -32,7 +32,7 @@ public class DetectFaceDemo {
// Draw a bounding box around each face.
for (Rect rect : faceDetections.toArray()) {
Core.rectangle(image, new Point(rect.x, rect.y), new Point(rect.x
Imgproc.rectangle(image, new Point(rect.x, rect.y), new Point(rect.x
+ rect.width, rect.y + rect.height), new Scalar(0, 255, 0));
}

2
samples/java/sbt/src/main/scala/ScalaDetectFaceDemo.scala
View File

@@ -27,7 +27,7 @@ object ScalaDetectFaceDemo {
// Draw a bounding box around each face.
for (rect <- faceDetections.toArray) {
Core.rectangle(
Imgproc.rectangle(
image,
new Point(rect.x, rect.y),
new Point(rect.x + rect.width,