Skip to content

Commit

Permalink
update resource to v9.6.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@DMGithubPublisher
DMGithubPublisher committed Feb 28, 2023
1 parent 3906101 commit c2b866b
Show file tree
Hide file tree
Showing 17 changed files with 238 additions and 10 deletions.
246 changes: 237 additions & 9 deletions include/DynamsoftBarcodeReader.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//9.6.0

#ifndef __DYNAMSOFT_BARCODE_READER_H__
#define __DYNAMSOFT_BARCODE_READER_H__

Expand Down Expand Up @@ -205,6 +207,8 @@ typedef void* HANDLE;
/**The PharmaCode license is invalid. */
#define DBRERR_PHARMACODE_LICENSE_INVALID -10062

/**The image's orientation is invalid. */
#define DBRERR_IMAGE_ORIENTATION_INVALID -10063
/**
* @}defgroup ErrorCode
*/
Expand Down Expand Up @@ -534,7 +538,15 @@ typedef enum BarcodeFormat_2
BF2_PHARMACODE_TWO_TRACK = 0x08,

/**PHARMACODE.*/
BF2_PHARMACODE = 0x0C
BF2_PHARMACODE = 0x0C,

/**ALL.*/
#if defined(_WIN32) || defined(_WIN64)
BF2_ALL = 0xFFFFFFFF
#else
BF2_ALL = -1
#endif

}BarcodeFormat_2;


Expand Down Expand Up @@ -634,6 +646,7 @@ typedef enum PDFReadingMode
#endif
}PDFReadingMode;


#pragma pack(push)
#pragma pack(1)

Expand Down Expand Up @@ -686,6 +699,9 @@ typedef struct tagImageData

/**The image pixel format used in the image byte array */
ImagePixelFormat format;

/**The orientation of the image */
int orientation;
}ImageData;

/**
Expand Down Expand Up @@ -1003,9 +1019,8 @@ typedef enum QRCodeErrorCorrectionLevel
*/
typedef enum DeformationResistingMode
{
/**Not supported yet. */
/**Resists deformation using the auto algorithm. Check @ref DRM for available argument settings.*/
DRM_AUTO = 0x01,

/**Resists deformation using the general algorithm. Check @ref DRM for available argument settings.*/
DRM_GENERAL = 0x02,
/**Resists deformation when the barcode is warped gently.*/
Expand Down Expand Up @@ -2023,11 +2038,27 @@ typedef struct tagFrameDecodingParameters
*/
ClarityFilterMode clarityFilterMode;

/**Set the time period used to ignore duplicate results found in frames.Measured in ms.
*
* @par Value range:
* [0, 600000]
* @par Default value:
* 3000
*/
int duplicateForgetTime;

/**Set the orientation of the frame image data.The value is the angle that the image needs to be rotated clockwise so it shows correctly on the display in its natural orientation.
*
* @par Value range:
* 0, 90, 180, or 270
* @par Default value:
* 0
*/
int orientation;
/**Reserved memory for the struct. The length of this array indicates the size of the memory reserved for this struct.
*
*/
char reserved[20];
char reserved[12];
}FrameDecodingParameters;

/**
Expand Down Expand Up @@ -2170,6 +2201,9 @@ typedef struct tagLocalizationResult
/**The confidence of the localization result*/
int confidence;

/**The transformation matrix.With this matrix, you can transform the localization coordinates to image's natural orientation. */
double transformationMatrix[9];

/**Reserved memory for the struct. The length of this array indicates the size of the memory reserved for this struct. */
char reserved[52];
}LocalizationResult, *PLocalizationResult;
Expand Down Expand Up @@ -2385,8 +2419,14 @@ typedef struct tagPDF417Details
/**The error correction level of the barcode */
int errorCorrectionLevel;

/**Whether the left row indicator of the PDF417 code exists */
int hasLeftRowIndicator;

/**Whether the right row indicator of the PDF417 code exists */
int hasRightRowIndicator;

/**Reserved memory for the struct. The length of this array indicates the size of the memory reserved for this struct. */
char reserved[32];
char reserved[24];
}PDF417Details;

/**
Expand Down Expand Up @@ -3013,6 +3053,18 @@ extern "C" {
*/
DBR_API int DBR_DecodeBuffer(void* barcodeReader, const unsigned char* pBufferBytes, const int width, const int height, const int stride, const ImagePixelFormat format, const char* pTemplateName);

/**
* Decode barcodes from source image defined as ImageData.
*
* @param [in] barcodeReader Handle of the barcode reader instance.
* @param [in] imageData The source image defined as ImageData.
* @param [in] pTemplateName The template name.
*
* @return Returns error code. Returns 0 if the function operates successfully. You can call
* DBR_GetErrorString() to get detailed error message.
*
*/
DBR_API int DBR_DecodeImageData(void* barcodeReader, const ImageData* imageData, const char* pTemplateName);
/**
* Decodes barcodes from an image file encoded as a base64 string.
*
Expand Down Expand Up @@ -3490,6 +3542,21 @@ extern "C" {
*/
DBR_API int DBR_SetTextResultCallback(void *barcodeReader, CB_TextResult cbFunction, void * pUser);

/**
* Sets callback function to process text results which is triggered when the library finishes decoding a frame and finds unique barcodes.
*
* @param [in] barcodeReader Handle of the barcode reader instance.
* @param [in] cbFunction Callback function.
* @param [in] pUser Customized arguments passed to your function.
*
* @return Returns error code. Returns 0 if the function operates successfully. You can call
* DBR_GetErrorString() to get detailed error message. Possible returns are:
* DBR_OK;
* DBRERR_FRAME_DECODING_THREAD_EXISTS;
*
*
*/
DBR_API int DBR_SetUniqueBarcodeCallback(void *barcodeReader, CB_TextResult cbFunction, void * pUser);
/**
* Sets callback function to process intermediate results generated during frame decoding.
*
Expand All @@ -3506,9 +3573,75 @@ extern "C" {
*/
DBR_API int DBR_SetIntermediateResultCallback(void *barcodeReader, CB_IntermediateResult cbFunction, void * pUser);


/**
* Sets a human-readable name that identifies the device.
*
* @param [in] name The device alias.
*
* @return error code (returns 0 if the function operates successfully).
*
*/
DBR_API int DBR_SetDeviceFriendlyName(const char* name);

/**
* Transform the coordinates of a point based on the given transformation matrix.
*
* @param [in] The original point that needs to be transformed.
* @param [in] The 3x3 matrix used for coordinate transformation.
*
* @return Returns The point after transformation.
*
*/
DBR_API DBRPoint DBR_TransformCoordinates(DBRPoint originalPoint, double transformationMatrix[9]);

/**
* Sets the max concurrent instance count used for current device and process.
*
* @param [in] countForThisDevice The maximum number of concurrent instances that the current device can run.
* @param [in] countForThisProcess Optional The maximum number of concurrent instances that the current process can run.
*
*/
DBR_API void DBR_SetMaxConcurrentInstanceCount(int countForThisDevice, int countForThisProcess);

/**
* Gets an idle Dynamsoft Barcode Reader instance running on concurrent instance mode.
*
*/
DBR_API void* DBR_GetInstance();

/**
*Recycles a Dynamsoft Barcode Reader instance running on concurrent instance mode.
*
*/
DBR_API void DBR_RecycleInstance(void* barcodeReader);

/**
* Gets whether the instance is valid for running on concurrent instance mode.
*
* @param [in] barcodeReader Handle of the barcode reader instance.
*
* @return Returns an int value indicating whether the instance is valid for running on concurrent instance mode.
*
*/
DBR_API int DBR_IsInstanceValid(void* barcodeReader);

/**
* Sets a directory path for saving the license data.
* @param [in] The directory path for saving the license data.
*/
DBR_API int DBR_SetLicenseCachePath(const char* directoryPath);

/**
* Gets the device uuid used for license activating.
* @param [in] the uuid GenerationMethod ,0:random 1:hardware
* @param [in,out] returns the uuid
*/
DBR_API int DBR_GetDeviceUUID(int uuidGenerationMethod, char** uuid);

/**
*Frees memory allocated for the string.
*/
DBR_API void DBR_FreeString(char** content);
/**
* @}defgroup CCallback
*/
Expand All @@ -3530,6 +3663,7 @@ namespace dynamsoft
{
namespace dbr
{

/**
*
* @defgroup CBarcodeReaderClass CBarcodeReader Class
Expand Down Expand Up @@ -3823,6 +3957,26 @@ namespace dynamsoft
*/
int DecodeBuffer(const unsigned char* pBufferBytes, const int iWidth, const int iHeight, const int iStride, const ImagePixelFormat format, const char* pszTemplateName = "");

/**
* Decodes barcodes from the memory buffer containing image pixels in defined format.
*
* @param [in] pBufferBytes The array of bytes which contain the image data.
* @param [in] iWidth The width of the image in pixels.
* @param [in] iHeight The height of the image in pixels.
* @param [in] iStride The stride (or scan width) of the image.
* @param [in] format The image pixel format used in the image byte array.
* @param [in] iOrientation The orientation of the image.
* @param [in] pszTemplateName (Optional) The template name.
*
* @return Returns error code. Returns 0 if the function operates successfully. You can call
* GetErrorString() to get detailed error message.
*
*
* @par Remarks:
* If no template name is specified, current runtime settings will be used.
*/
int DecodeBuffer(const unsigned char* pBufferBytes, const int iWidth, const int iHeight, const int iStride, const ImagePixelFormat format,const int iOrientation, const char* pszTemplateName = "");

/**
* Decodes barcode from an image file encoded as a base64 string.
*
Expand Down Expand Up @@ -4295,26 +4449,100 @@ namespace dynamsoft
*/
int SetIntermediateResultCallback(CB_IntermediateResult cbFunction, void * pUser);

/**
* Sets callback function to process text results which is triggered when the library finishes decoding a frame and finds unique barcodes.
*
* @param [in] cbFunction Callback function.
* @param [in] pUser Customized arguments passed to your function.
*
* @return Returns error code. Returns 0 if the function operates successfully. You can call
* DBR_GetErrorString() to get detailed error message. Possible returns are:
* DBR_OK;
* DBRERR_FRAME_DECODING_THREAD_EXISTS;
*
*
*/
int SetUniqueBarcodeCallback(CB_TextResult cbFunction, void * pUser);
/**
* Gets whether the instance is valid for running on concurrent instance mode.
*
* @return Returns an int value indicating whether the instance is valid for running on concurrent instance mode.
*
*/
int IsInstanceValid();

/**
* Sets a human-readable name that identifies the device.
*
* @param [in] name The device alias.
*
* @return error code (returns 0 if the function operates successfully).
*
*/
static int SetDeviceFriendlyName(const char* name);

/**
* @}
* Transform the coordinates of a point based on the given transformation matrix.
*
* @param [in] The original point that needs to be transformed.
* @param [in] The 3x3 matrix used for coordinate transformation.
*
* @return Returns The point after transformation.
*
*/
private:
static DBRPoint TransformCoordinates(DBRPoint originalPoint, double transformationMatrix[9]);

/**
* Sets the max concurrent instance count used for current device and process.
*
* @param [in] countForThisDevice The maximum number of concurrent instances that the current device can run.
* @param [in] countForThisProcess Optional The maximum number of concurrent instances that the current process can run.
*
*/
static void SetMaxConcurrentInstanceCount(int countForThisDevice, int countForThisProcess = 0);

/**
* Gets an idle Dynamsoft Barcode Reader instance running on concurrent instance mode.
*
*/
static CBarcodeReader* GetInstance();

/**
*Recycles a Dynamsoft Barcode Reader instance running on concurrent instance mode.
*
*/
void Recycle();

/**
* Sets a directory path for saving the license data.
* @param [in] The directory path for saving the license data.
*/
static int SetLicenseCachePath(const char* directoryPath);

/**
* Gets the device uuid used for license activating.
* @param [in] the uuid GenerationMethod.
* @param [in,out] returns the uuid
*/
static int GetDeviceUUID(int uuidGenerationMethod, char** uuid);

/**
*Frees memory allocated for the string.
*/
static void FreeString(char** content);
private:
CBarcodeReader(const CBarcodeReader& r);

CBarcodeReader& operator = (const CBarcodeReader& r);

};


/**
* @}defgroup CBarcodeReaderClass
* @}defgroup CandCPlus
*
*/

}
}
#endif // endif of __cplusplus.
Expand Down
2 changes: 1 addition & 1 deletion include/DynamsoftCommon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
/**Instance count is over limit.*/
#define DMERR_INSTANCE_COUNT_OVER_LIMIT -20008

/**Interface InitLicenseFromDLS has to be called before creating any SDK objects.*/
/**Interface InitLicense has to be called before creating any SDK objects.*/
#define DMERR_LICENSE_INIT_SEQUENCE_FAILED -20009

/**Trial License*/
Expand Down
Loading

0 comments on commit c2b866b

Please sign in to comment.