1. 11 Jul, 2016 1 commit
  2. 23 May, 2016 1 commit
  3. 13 Apr, 2016 1 commit
  4. 07 Mar, 2016 1 commit
    • Jason von Nieda's avatar
      Adds supports for the majority of features2d to the Java wrappers: · f4b502dd
      Jason von Nieda authored
      * Adds the main features2d header to the parse list for the generator.
      * Removes the manual definition of drawKeypoints and drawMatches since these are now included in the main header.
      * Updates the generator to ignore SimpleBlobDetector, FlannBasedMatcher and DescriptorMatcher as these cause conflicts with the generator. This is okay since these were not previously included in the distribution anyway, so no harm is done.
      f4b502dd
  5. 18 Dec, 2015 2 commits
  6. 16 Dec, 2015 1 commit
  7. 29 Oct, 2015 1 commit
  8. 20 Oct, 2015 1 commit
  9. 08 Oct, 2015 1 commit
  10. 07 Oct, 2015 1 commit
  11. 01 Oct, 2015 1 commit
  12. 22 Sep, 2015 1 commit
  13. 19 Sep, 2015 1 commit
    • Andrey Pavlenko's avatar
      draft implementation of alternative CameraBridge via GLES · 8e088d38
      Andrey Pavlenko authored
      a simple sample will look like:
      
      ```java
      public class MainActivity extends Activity implements CameraGLSurfaceView.CameraTextureListener {
      
      	CameraGLSurfaceView mView;
      	ByteBuffer buf;
      
          @Override
          protected void onCreate(Bundle savedInstanceState) {
              super.onCreate(savedInstanceState);
              requestWindowFeature(Window.FEATURE_NO_TITLE);
              getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                      WindowManager.LayoutParams.FLAG_FULLSCREEN);
              getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
                      WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
              setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
      
              mView = new CameraGLSurfaceView(this, null);
              mView.setCameraTextureListener(this);
              setContentView(mView);
              buf = ByteBuffer.allocateDirect(1920*1080*4);
          }
      
          @Override
          protected void onPause() {
              mView.onPause();
              super.onPause();
          }
      
          @Override
          protected void onResume() {
              super.onResume();
              mView.onResume();
          }
      
      	@Override
      	public void onCameraViewStarted(int width, int height) {
      		// TODO Auto-generated method stub
      
      	}
      
      	@Override
      	public void onCameraViewStopped() {
      		// TODO Auto-generated method stub
      
      	}
      
      	@Override
      	public boolean onCameraFrame(int texIn, int texOut, int width, int height) {
      		Log.i("MAIN", "onCameraFrame");
      		int w=width, h=height;
      		/*
      		// option 1:
      		// just return 'false' to display texIn on screen
      		retutn false;
      		*/
      
      		/*
      		// option 2:
      		// fast copy texIn to texOut
      		GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
          	GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texOut);
      		GLES20.glCopyTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA, 0, 0, w, h, 0);
      		return true;
      		*/
      
      		// option 3:
      		// read, modify and write back pixels
      		GLES20.glReadPixels(0, 0, w, h, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);
      
      		buf.rewind();
      		// red line
      		for(int i=0; i<h; i++) {
      			buf.position(w*4*i+i*4);
      			buf.put((byte) -1);
      			buf.position(w*4*i+i*4+4);
      			buf.put((byte) -1);
      		}
      		buf.rewind();
      
      		GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
          	GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texOut);
      		GLES20.glTexSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0, w, h, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);
      		return true;
      	}
      }
      ```
      8e088d38
  14. 27 Aug, 2015 1 commit
  15. 26 Aug, 2015 1 commit
  16. 29 Jul, 2015 1 commit
  17. 19 Jun, 2015 1 commit
  18. 03 Jun, 2015 1 commit
  19. 02 Jun, 2015 1 commit
  20. 26 May, 2015 4 commits
  21. 23 May, 2015 1 commit
  22. 19 May, 2015 2 commits
  23. 13 May, 2015 1 commit
  24. 12 May, 2015 1 commit
  25. 24 Apr, 2015 1 commit
    • Simon Heinen's avatar
      squashed #3729 · 6decc259
      Simon Heinen authored
      Update android+AsyncServiceHelper.java
      
      Update android+AsyncServiceHelper.java
      
      changed tabs in last commit to spaces
      
      Update android+AsyncServiceHelper.java
      
      small formatting fixes
      6decc259
  26. 17 Apr, 2015 2 commits
  27. 02 Apr, 2015 2 commits
  28. 25 Mar, 2015 1 commit
    • Prof. Dr. Rudolf Haussmann's avatar
      Changes to be committed: · a9d4e053
      Prof. Dr. Rudolf Haussmann authored
         (use "git reset HEAD <file>..." to unstage)
      
      	modified:   highgui/include/opencv2/highgui/highgui_c.h
      	modified:   highgui/src/cap_dshow.cpp
      	modified:   java/generator/gen_java.py
      
      The correction of the orthographic error in the enumeration constant
      CAP_PROP_MONOCROME has been undone.
      a9d4e053
  29. 20 Mar, 2015 1 commit
    • Prof. Dr. Rudolf Haussmann's avatar
      Changes to be committed: · a7bf1d53
      Prof. Dr. Rudolf Haussmann authored
         (use "git reset HEAD <file>..." to unstage)
      
      	modified:   modules/highgui/include/opencv2/highgui/highgui_c.h
      	modified:   modules/highgui/src/cap_dshow.cpp
      	modified:   modules/highgui/src/cap_pvapi.cpp
      	modified:   modules/java/generator/gen_java.py
      
      Änderungen in der PvAPI hinzugefügt.
      a7bf1d53
  30. 19 Mar, 2015 1 commit
  31. 07 Mar, 2015 1 commit
    • Prof. Dr. Rudolf Haussmann's avatar
      Changes to be committed: · 9f1eb70d
      Prof. Dr. Rudolf Haussmann authored
         (use "git reset HEAD <file>..." to unstage)
      
      	modified:   modules/java/generator/gen_java.py
      	modified:   modules/videoio/include/opencv2/videoio.hpp
      	modified:   modules/videoio/include/opencv2/videoio/videoio_c.h
      	modified:   modules/videoio/src/cap_dshow.cpp
      	modified:   modules/videoio/src/cap_pvapi.cpp
      
      Following changes have been made:
      1. Some minor bugs have been removed.
      2. In the PvAPI module the option CAP_PROP_MONOCROME has been removed because
         this option does not make sense and causes an error if a color camera is used.
      3. Instead the new option CAP_PROP_PVAPI_PIXELFORMAT has been added which allows
         to activate the different pixel formats (color modes) of an AVT camera.
      4. Since there were two identical defines
         CAP_PROP_MONOCROME = 19
         CAP_PROP_MONOCHROME = 19
         which were also used in the other module DSHOW, the first one with an orthographic
         error has been removed in favor of the second one.
      9f1eb70d
  32. 02 Mar, 2015 1 commit
  33. 24 Feb, 2015 1 commit