platform/upstream/opencv.git
11 years agofix gpu warnings with signed/unsigned char
Vladislav Vinogradov [Tue, 18 Jun 2013 09:17:33 +0000 (13:17 +0400)]
fix gpu warnings with signed/unsigned char

11 years agoMerge pull request #994 from asmorkalov:android_java_wrappers
Roman Donchenko [Tue, 18 Jun 2013 12:46:03 +0000 (16:46 +0400)]
Merge pull request #994 from asmorkalov:android_java_wrappers

11 years agoJava/Python bindings for computeCorrespondEpilines added.
Alexander Smorkalov [Thu, 13 Jun 2013 11:38:21 +0000 (15:38 +0400)]
Java/Python bindings for computeCorrespondEpilines added.

Simle Java test for computeCorrespondEpilines added.

11 years agoMerge pull request #1007 from alekcac:i_camera
Roman Donchenko [Tue, 18 Jun 2013 11:54:01 +0000 (15:54 +0400)]
Merge pull request #1007 from alekcac:i_camera

11 years agoupdated licenses
Alexander Shishkov [Tue, 18 Jun 2013 03:02:09 +0000 (07:02 +0400)]
updated licenses

11 years agofixed Kirill's comments
Alexander Shishkov [Tue, 18 Jun 2013 02:59:52 +0000 (06:59 +0400)]
fixed Kirill's comments

11 years agoMerge pull request #996 from jet47:gpu-nvcuvid-libraries
Roman Donchenko [Fri, 14 Jun 2013 12:23:01 +0000 (16:23 +0400)]
Merge pull request #996 from jet47:gpu-nvcuvid-libraries

11 years agoMerge pull request #995 from jet47:fix-bug-2985
Roman Donchenko [Fri, 14 Jun 2013 12:22:47 +0000 (16:22 +0400)]
Merge pull request #995 from jet47:fix-bug-2985

11 years agoMerge pull request #999 from snosov1:unreliable-results-fix
Roman Donchenko [Fri, 14 Jun 2013 12:19:50 +0000 (16:19 +0400)]
Merge pull request #999 from snosov1:unreliable-results-fix

11 years agoMerge pull request #1005 from alekcac:doc_fix
Roman Donchenko [Fri, 14 Jun 2013 11:53:35 +0000 (15:53 +0400)]
Merge pull request #1005 from alekcac:doc_fix

11 years agoMerge pull request #1004 from jet47:fix-bug-3068
Roman Donchenko [Fri, 14 Jun 2013 11:52:56 +0000 (15:52 +0400)]
Merge pull request #1004 from jet47:fix-bug-3068

11 years agoMerge pull request #987 from jet47:bug-3085-fix
Roman Donchenko [Fri, 14 Jun 2013 11:49:33 +0000 (15:49 +0400)]
Merge pull request #987 from jet47:bug-3085-fix

11 years agoMerge pull request #969 from pengx17:2.4_binary_cache
Roman Donchenko [Fri, 14 Jun 2013 11:47:23 +0000 (15:47 +0400)]
Merge pull request #969 from pengx17:2.4_binary_cache

11 years agoMerge pull request #929 from dominikrose:mingw-libdc1394-2-windows
Roman Donchenko [Fri, 14 Jun 2013 11:46:23 +0000 (15:46 +0400)]
Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows

11 years agoUpdated iOS camera. Added rotation flag. Added functions to lock/unlock focus, white...
Alexander Shishkov [Fri, 14 Jun 2013 11:10:25 +0000 (15:10 +0400)]
Updated iOS camera. Added rotation flag. Added functions to lock/unlock focus, white balance and exposure.

11 years agoMerge pull request #1000 from ivan-korolev:fix_sift_bug_2892
Roman Donchenko [Fri, 14 Jun 2013 09:50:01 +0000 (13:50 +0400)]
Merge pull request #1000 from ivan-korolev:fix_sift_bug_2892

11 years agoMerge pull request #1001 from ivan-korolev:fix_stitching_bug_2405
Roman Donchenko [Fri, 14 Jun 2013 09:47:32 +0000 (13:47 +0400)]
Merge pull request #1001 from ivan-korolev:fix_stitching_bug_2405

11 years agoFix bug with indices
Alexander Shishkov [Fri, 14 Jun 2013 09:12:35 +0000 (13:12 +0400)]
Fix bug with indices

11 years agofix for bug #3068 (PCA::computeVar for double input):
Vladislav Vinogradov [Fri, 14 Jun 2013 08:53:44 +0000 (12:53 +0400)]
fix for bug #3068 (PCA::computeVar for double input):

The matrix g  can have CV_32F or CV_64F type,  but g.at uses only float template.
This fix adds specialization for double type.

11 years agoFix a bug caused by NDEBUG macro; it is now removed.
peng xiao [Fri, 14 Jun 2013 08:37:00 +0000 (16:37 +0800)]
Fix a bug caused by NDEBUG macro; it is now removed.
Revise some descriptions of the enums.

11 years agoFixed a bug #2405
Ivan Korolev [Fri, 14 Jun 2013 06:43:20 +0000 (10:43 +0400)]
Fixed a bug #2405

11 years agoMerge pull request #998 from asmorkalov:android_cmake_mips_fix
Andrey Pavlenko [Fri, 14 Jun 2013 06:17:23 +0000 (10:17 +0400)]
Merge pull request #998 from asmorkalov:android_cmake_mips_fix

11 years agoFixed a bug #2892
Ivan Korolev [Fri, 14 Jun 2013 04:21:42 +0000 (08:21 +0400)]
Fixed a bug #2892

11 years agoadd multiruns to fix "unreliable results" error
Sergei Nosov [Thu, 13 Jun 2013 17:14:42 +0000 (21:14 +0400)]
add multiruns to fix "unreliable results" error

11 years agoMerge pull request #993 from ivan-korolev:fix_videostab_bug_3023
Roman Donchenko [Thu, 13 Jun 2013 12:57:12 +0000 (16:57 +0400)]
Merge pull request #993 from ivan-korolev:fix_videostab_bug_3023

11 years agoMerge pull request #988 from snosov1:3071-fix
Roman Donchenko [Thu, 13 Jun 2013 12:56:40 +0000 (16:56 +0400)]
Merge pull request #988 from snosov1:3071-fix

11 years agoMerge pull request #986 from pengx17:2.4_initiated_context
Roman Donchenko [Thu, 13 Jun 2013 12:55:55 +0000 (16:55 +0400)]
Merge pull request #986 from pengx17:2.4_initiated_context

11 years agoMerge pull request #982 from pengx17:2.4_fix_two_bugs
Roman Donchenko [Thu, 13 Jun 2013 12:55:12 +0000 (16:55 +0400)]
Merge pull request #982 from pengx17:2.4_fix_two_bugs

11 years agoMerge pull request #981 from SeninAndrew:ximea_camera_support_fix
Roman Donchenko [Thu, 13 Jun 2013 12:54:45 +0000 (16:54 +0400)]
Merge pull request #981 from SeninAndrew:ximea_camera_support_fix

11 years agoFix build problems on MIPS and Linaro NDK.
Alexander Smorkalov [Thu, 13 Jun 2013 12:51:45 +0000 (16:51 +0400)]
Fix build problems on MIPS and Linaro NDK.

Merged android.toolchain.cmake from project
https://github.com/taka-no-me/android-cmake
commit: fd1f7055f8b7338644d58d9a2015a784dfa3a5ca

11 years agolink with nvcuvenc and ffmpeg libraries only if WITH_NVCUVID is enabled
Vladislav Vinogradov [Thu, 13 Jun 2013 12:46:34 +0000 (16:46 +0400)]
link with nvcuvenc and ffmpeg libraries only if WITH_NVCUVID is enabled

11 years agoMerge pull request #991 from asmorkalov:android_javadoc_fix
Roman Donchenko [Thu, 13 Jun 2013 12:30:14 +0000 (16:30 +0400)]
Merge pull request #991 from asmorkalov:android_javadoc_fix

11 years agofix for bug #2985:
Vladislav Vinogradov [Thu, 13 Jun 2013 12:13:46 +0000 (16:13 +0400)]
fix for bug #2985:

OPENCLAMDBLAS and OPENCLAMDFFT never detected under linux.
lib64/import and lib32/import is the path on Windows but not Linux.
for CLAMDBLAS library we should use CLAMDBLAS_PATH (not CLAMDFFT_PATH)

11 years agoFixed a bug related to video stabilization crashes with a blank video (Bug #3023)
Ivan Korolev [Thu, 13 Jun 2013 09:41:43 +0000 (13:41 +0400)]
Fixed a bug related to video stabilization crashes with a blank video (Bug #3023)

11 years agoJavadoc waring fix.
Alexander Smorkalov [Thu, 13 Jun 2013 08:40:14 +0000 (12:40 +0400)]
Javadoc waring fix.

11 years agoFixes bug #3071.
Sergei Nosov [Thu, 13 Jun 2013 07:51:45 +0000 (11:51 +0400)]
Fixes bug #3071.

If we have perfect matches (min_dist == 0.0), then strict comparison
fails. Making it non-strict results in treating perfect matches as
good.

11 years agofix for Bug #3085:
Vladislav Vinogradov [Thu, 13 Jun 2013 06:22:56 +0000 (10:22 +0400)]
fix for Bug #3085:

weights array is only allocated for (l_count+1) elements,
but then weights[l_count+1] element is accessed.

11 years agoAdd a function to query if global OpenCL context is initialized.
peng xiao [Thu, 13 Jun 2013 02:46:12 +0000 (10:46 +0800)]
Add a function to query if global OpenCL context is initialized.

11 years agoFix two bugs related to opencl context.
Peng Xiao [Wed, 12 Jun 2013 05:55:20 +0000 (13:55 +0800)]
Fix two bugs related to opencl context.
1. As getDevice will implicitly call setDevice, in getContext we should not need to call it again.
2. Fix an incorrect type casting.

11 years agoFixed Ximea cameras support
Andrew Senin [Tue, 11 Jun 2013 17:17:31 +0000 (21:17 +0400)]
Fixed Ximea cameras support

11 years agoMerge pull request #972 from jet47:mog2-params-bug-2168
Roman Donchenko [Tue, 11 Jun 2013 14:21:52 +0000 (18:21 +0400)]
Merge pull request #972 from jet47:mog2-params-bug-2168

11 years agoMerge pull request #980 from SpecLad:include-config
Roman Donchenko [Tue, 11 Jun 2013 14:18:14 +0000 (18:18 +0400)]
Merge pull request #980 from SpecLad:include-config

11 years agoMerge pull request #973 from pengx17:2.4_oclclahe
Roman Donchenko [Tue, 11 Jun 2013 14:17:56 +0000 (18:17 +0400)]
Merge pull request #973 from pengx17:2.4_oclclahe

11 years agoMerge pull request #903 from aks2:2.4
Roman Donchenko [Tue, 11 Jun 2013 13:35:38 +0000 (17:35 +0400)]
Merge pull request #903 from aks2:2.4

11 years agoUse anonymous enumerations instead of constants
Peng Xiao [Tue, 11 Jun 2013 12:32:55 +0000 (20:32 +0800)]
Use anonymous enumerations instead of constants

11 years agoMerge pull request #968 from asmorkalov:android_na_cproj_fix
Roman Donchenko [Tue, 11 Jun 2013 07:59:31 +0000 (11:59 +0400)]
Merge pull request #968 from asmorkalov:android_na_cproj_fix

11 years agoRevert "Add a variant of detectMultiScale with an argument 'weights'"
Roman Donchenko [Mon, 10 Jun 2013 13:06:34 +0000 (17:06 +0400)]
Revert "Add a variant of detectMultiScale with an argument 'weights'"

It was merged by mistake.

This reverts commit ab6be9b7b7691967e42297aa6d3a67fb07597fd8.

11 years agoMerge pull request #961 from PeterMinin:detected_objects_weight
Vadim Pisarevsky [Mon, 10 Jun 2013 11:22:46 +0000 (15:22 +0400)]
Merge pull request #961 from PeterMinin:detected_objects_weight

11 years agoMerge pull request #971 from SpecLad:matchers-ctor
Roman Donchenko [Mon, 10 Jun 2013 11:06:31 +0000 (15:06 +0400)]
Merge pull request #971 from SpecLad:matchers-ctor

11 years agoMerge pull request #970 from asmorkalov:dshow_valid_check_fix
Roman Donchenko [Mon, 10 Jun 2013 11:06:14 +0000 (15:06 +0400)]
Merge pull request #970 from asmorkalov:dshow_valid_check_fix

11 years agoBug #3044 cap_dshow.cpp forgotten validity check fixed.
Alexander Smorkalov [Mon, 10 Jun 2013 20:29:45 +0000 (13:29 -0700)]
Bug #3044 cap_dshow.cpp forgotten validity check fixed.

11 years agoMerge pull request #965 from apavlenko:fix_java_empty_mats
Roman Donchenko [Mon, 10 Jun 2013 11:03:31 +0000 (15:03 +0400)]
Merge pull request #965 from apavlenko:fix_java_empty_mats

11 years agoAdd ocl CLACH implementation.
Peng Xiao [Mon, 10 Jun 2013 10:37:48 +0000 (18:37 +0800)]
Add ocl CLACH implementation.
Test cases (accuracy and performance) are provided.

11 years agoadded missing BackgroundSubtractorMOG2 parameters
Vladislav Vinogradov [Mon, 10 Jun 2013 09:41:46 +0000 (13:41 +0400)]
added missing BackgroundSubtractorMOG2 parameters

11 years agoErase MatchPairsBody's copy constructor.
Roman Donchenko [Mon, 10 Jun 2013 09:30:23 +0000 (13:30 +0400)]
Erase MatchPairsBody's copy constructor.

It's the same as the implicitly defined one, and it causes a -Wextra warning
(not initializing the base class in a copy constructor).

11 years agoAdd a new global function to control ocl binary storage
Peng Xiao [Mon, 10 Jun 2013 08:38:22 +0000 (16:38 +0800)]
Add a new global function to control ocl binary storage

Previously the feature is controlled by setBinpath implicitly.
We add the function to cope with setBinpath and setBinpath is only
useful when setBinaryDiskCache is set.
Refer to the header to see more info.

11 years agoNativeActivity sample build with Eclipse CDT fixed.
Alexander Smorkalov [Mon, 10 Jun 2013 07:06:28 +0000 (11:06 +0400)]
NativeActivity sample build with Eclipse CDT fixed.

11 years agofixing empty Mat case
Andrey Pavlenko [Sat, 8 Jun 2013 08:41:57 +0000 (12:41 +0400)]
fixing empty Mat case

11 years agoInclude the OpenCV config headers into every module.
Roman Donchenko [Fri, 7 Jun 2013 15:07:00 +0000 (19:07 +0400)]
Include the OpenCV config headers into every module.

This has no bearing on compilation, but it makes them show up in IDEs.

11 years agoMerge pull request #946 from bitwangyaoyao:2.4_samples2
Vadim Pisarevsky [Fri, 7 Jun 2013 09:44:28 +0000 (13:44 +0400)]
Merge pull request #946 from bitwangyaoyao:2.4_samples2

11 years agoMerge pull request #957 from pengx17:2.4_fix_corner_detector
Vadim Pisarevsky [Fri, 7 Jun 2013 09:44:10 +0000 (13:44 +0400)]
Merge pull request #957 from pengx17:2.4_fix_corner_detector

11 years agoMerge pull request #960 from SpecLad:extra-modules
Roman Donchenko [Fri, 7 Jun 2013 07:29:40 +0000 (11:29 +0400)]
Merge pull request #960 from SpecLad:extra-modules

11 years agoMerge pull request #959 from SpecLad:qt4-build
Roman Donchenko [Fri, 7 Jun 2013 07:27:45 +0000 (11:27 +0400)]
Merge pull request #959 from SpecLad:qt4-build

11 years agoAdd a variant of detectMultiScale with an argument 'weights' that
Peter Minin [Thu, 6 Jun 2013 15:00:55 +0000 (19:00 +0400)]
Add a variant of detectMultiScale with an argument 'weights' that
receives the number of neighbors joined into each detected object

11 years agoMerge pull request #955 from SpecLad:symlink
Roman Donchenko [Thu, 6 Jun 2013 13:58:14 +0000 (17:58 +0400)]
Merge pull request #955 from SpecLad:symlink

11 years agoFix a missing header path when building with Qt 4.
Roman Donchenko [Thu, 6 Jun 2013 10:09:33 +0000 (14:09 +0400)]
Fix a missing header path when building with Qt 4.

Also, removing explicit include path configuration,
since QT_USE_FILE takes care of that.

11 years agoFix a bug of cornerHarris and cornerMinEigenVal.
peng xiao [Thu, 6 Jun 2013 03:44:35 +0000 (11:44 +0800)]
Fix a bug of cornerHarris and cornerMinEigenVal.
The bug is a buffer overrun when border type is reflect101.
It is found that gfft crashed with input of size 100x100 on Intel CPU.

11 years agoAdd support for adding custom OpenCV modules.
Roman Donchenko [Wed, 5 Jun 2013 14:09:47 +0000 (18:09 +0400)]
Add support for adding custom OpenCV modules.

11 years agoMerge pull request #953 from jet47:fix-bug-3069
Roman Donchenko [Wed, 5 Jun 2013 13:56:35 +0000 (17:56 +0400)]
Merge pull request #953 from jet47:fix-bug-3069

11 years agoMerge pull request #952 from SpecLad:jepg
Roman Donchenko [Wed, 5 Jun 2013 13:50:11 +0000 (17:50 +0400)]
Merge pull request #952 from SpecLad:jepg

11 years agoDon't resolve symlinks when looking for modules.
Roman Donchenko [Wed, 5 Jun 2013 11:54:27 +0000 (15:54 +0400)]
Don't resolve symlinks when looking for modules.

We don't really need it, it makes the code longer, and it can lead to
inconsistent paths when OpenCV is itself inside a symlink.

11 years agoMerge pull request #948 from jet47:cuda-5.5-support
Roman Donchenko [Wed, 5 Jun 2013 13:04:21 +0000 (17:04 +0400)]
Merge pull request #948 from jet47:cuda-5.5-support

11 years agoMerge pull request #890 from caorong:patch-1
Roman Donchenko [Wed, 5 Jun 2013 12:00:25 +0000 (16:00 +0400)]
Merge pull request #890 from caorong:patch-1

11 years agofix a bug(DetectorType never change)
caorong [Thu, 16 May 2013 03:26:37 +0000 (11:26 +0800)]
fix a bug(DetectorType never change)

changed line281 -> line220
Presentation:
because line 220 give the globle var mDetectorType,and in line 230 it will be compared with mDeteorType !!!  it will never be unequal ~
fix:
change mDetectorType(previous globle var) to a new local val tmpDetectorType

11 years agofixed bug #3069 (infinite loop in GPU LBP Cascade detectMultiScale)
Vladislav Vinogradov [Wed, 5 Jun 2013 10:08:55 +0000 (14:08 +0400)]
fixed bug #3069 (infinite loop in GPU LBP Cascade detectMultiScale)

11 years agoFix typo in .gitattributes.
Roman Donchenko [Wed, 5 Jun 2013 09:51:11 +0000 (13:51 +0400)]
Fix typo in .gitattributes.

11 years agoMerge pull request #947 from jet47:fix-gpu-arm-build
Roman Donchenko [Wed, 5 Jun 2013 07:50:11 +0000 (11:50 +0400)]
Merge pull request #947 from jet47:fix-gpu-arm-build

11 years agoMerge pull request #941 from apavlenko:signed_char
Roman Donchenko [Wed, 5 Jun 2013 07:27:08 +0000 (11:27 +0400)]
Merge pull request #941 from apavlenko:signed_char

11 years agoMerge pull request #893 from jet47:gpu-arm-fixes
Roman Donchenko [Tue, 4 Jun 2013 13:52:30 +0000 (17:52 +0400)]
Merge pull request #893 from jet47:gpu-arm-fixes

11 years agoMerge pull request #940 from SpecLad:autolock
Roman Donchenko [Tue, 4 Jun 2013 13:50:31 +0000 (17:50 +0400)]
Merge pull request #940 from SpecLad:autolock

11 years agofixed BroxOpticalFlow sanity test (increase epsilon value)
Vladislav Vinogradov [Tue, 4 Jun 2013 11:01:06 +0000 (15:01 +0400)]
fixed BroxOpticalFlow sanity test (increase epsilon value)

+ interpolateFrames and createOpticalFlowNeedleMap

11 years agofixed BoxFilter sanity test (different rounding results)
Vladislav Vinogradov [Tue, 4 Jun 2013 10:59:47 +0000 (14:59 +0400)]
fixed BoxFilter sanity test (different rounding results)

11 years agofixed BroxOpticalFlow regression test
Vladislav Vinogradov [Tue, 4 Jun 2013 09:58:45 +0000 (13:58 +0400)]
fixed BroxOpticalFlow regression test

the output of BroxOpticalFlow differs a bit in CUDA 5.5

11 years agorewrite gpu/device/vec_math.hpp file
Vladislav Vinogradov [Tue, 4 Jun 2013 09:57:35 +0000 (13:57 +0400)]
rewrite gpu/device/vec_math.hpp file

old version isn't compiled with CUDA 5.5
new version doesn't depend on functional.hpp

11 years agoMerge pull request #933 from pengx17:2.4_macfix_cont
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:53 +0000 (13:34 +0400)]
Merge pull request #933 from pengx17:2.4_macfix_cont

11 years agoMerge pull request #935 from pengx17:2.4_filter2d_fix
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:39 +0000 (13:34 +0400)]
Merge pull request #935 from pengx17:2.4_filter2d_fix

11 years agoMerge pull request #936 from bitwangyaoyao:2.4_perf
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:25 +0000 (13:34 +0400)]
Merge pull request #936 from bitwangyaoyao:2.4_perf

11 years agoMerge pull request #937 from bitwangyaoyao:2.4_fixPyrLK
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:09 +0000 (13:34 +0400)]
Merge pull request #937 from bitwangyaoyao:2.4_fixPyrLK

11 years agoMerge pull request #938 from pengx17:2.4_surf_sample
Vadim Pisarevsky [Tue, 4 Jun 2013 09:33:48 +0000 (13:33 +0400)]
Merge pull request #938 from pengx17:2.4_surf_sample

11 years agoMerge pull request #939 from pengx17:2.4_getDevice
Vadim Pisarevsky [Tue, 4 Jun 2013 09:33:21 +0000 (13:33 +0400)]
Merge pull request #939 from pengx17:2.4_getDevice

11 years agofixed gpu module build on arm platform
Vladislav Vinogradov [Tue, 4 Jun 2013 08:51:36 +0000 (12:51 +0400)]
fixed gpu module build on arm platform

links with CUDA driver library only if we use video encoding/decoding

11 years agouse GoodFeaturesToTrackDetector_OCL
yao [Tue, 4 Jun 2013 07:59:21 +0000 (15:59 +0800)]
use GoodFeaturesToTrackDetector_OCL

11 years agoFix a bug of gfft.
peng xiao [Tue, 4 Jun 2013 07:55:33 +0000 (15:55 +0800)]
Fix a bug of gfft.
When user provided corners buffer is big enough to be copied to from
tmpCorners_, we allow the buffer to be reused other than allocate a new
cl_mem object.

11 years agochange a test image of pyrlk
yao [Tue, 4 Jun 2013 03:31:54 +0000 (11:31 +0800)]
change a test image of pyrlk

11 years agoMerge pull request #943 from jet47:cuda-5.5-support
Roman Donchenko [Mon, 3 Jun 2013 12:08:23 +0000 (16:08 +0400)]
Merge pull request #943 from jet47:cuda-5.5-support

11 years agoMerge pull request #944 from jet47:cmake-2.8.11-cuda-fix
Roman Donchenko [Mon, 3 Jun 2013 12:08:06 +0000 (16:08 +0400)]
Merge pull request #944 from jet47:cmake-2.8.11-cuda-fix

11 years agofixed constructors for functional objects (added __host__ modifier)
Vladislav Vinogradov [Mon, 3 Jun 2013 10:41:23 +0000 (14:41 +0400)]
fixed constructors for functional objects (added __host__ modifier)

11 years agodisabled samples with driver api
Vladislav Vinogradov [Mon, 3 Jun 2013 10:01:04 +0000 (14:01 +0400)]
disabled samples with driver api

11 years agofixed norm diff function (it uses pre-allocated buffer now)
Vladislav Vinogradov [Mon, 3 Jun 2013 09:36:02 +0000 (13:36 +0400)]
fixed norm diff function (it uses pre-allocated buffer now)

11 years agofixed NPP error constants usage
Vladislav Vinogradov [Mon, 3 Jun 2013 09:34:41 +0000 (13:34 +0400)]
fixed NPP error constants usage