← Back to branch summary

~ubuntu-branches/debian/wheezy/cuneiform/wheezy

« back to all changes in this revision

Viewing changes to cuneiform_src/Kern/exc/src/extrcomp.c

  • Committer: Bazaar Package Importer
  • Author(s): Jakub Wilk
  • Date: 2011-04-30 13:16:24 UTC
  • mfrom: (1.1.3 upstream) (5.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110430131624-6yqf92183p6hshur
Tags: 1.1.0+dfsg-1
http://bugs.debian.org/596917
* Upload to unstable.
* New upstream release.
  + Drop patches: c-assert.diff, cuneiform.h-rename-*.diff,
    slovenian-slv.diff, soname.diff, swabytes.diff. All applied upstream.
  + Refresh the remaining patches.
  + Update *.install files.
  + Fix incorrect use of va_list (closes: #596917).
* Re-add c-assert.diff to fix another instance of custom assert() macro.
* Use stricter check level for dpkg-gensymbols.
* Bump standards version to 3.9.2 (no changes needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
cuneiform_src/Kern/exc/src/extrcomp.c
54
54
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
55
55
*/
56
56
 
57
 
/*#include <windows.h>*/
58
57
#include <sys/stat.h>
59
 
/*#include <io.h>*/
60
58
#include <stdlib.h>
61
59
#include <setjmp.h>
62
60
#include <assert.h>
63
61
#include <stdio.h>
64
62
#include <fcntl.h>
65
 
/*#include <direct.h>*/
 
63
#ifndef _MSC_VER
 
64
#include <unistd.h>
 
65
#endif
66
66
 
67
67
#include "compat_defs.h"
68
68
 
1184
1184
        CASE_DATA(REXC_Word8_Matrix                     ,uchar,matrix);
1185
1185
        CASE_DATA(REXC_Word8_Fax1x2                     ,uchar,fax1x2);
1186
1186
        CASE_DATA(REXC_Word16_ActualResolution  ,uint16_t,actual_resolution);
1187
 
/*-Andrey: moved to RRecCom (recognition) and RNorm (autorotate)
1188
 
//--------------------------------------------------------------
1189
 
        case REXC_FNEVNPROPERT:
1190
 
            *(uint32_t*)pData =          (uint32_t)REXC_SetEVNProperties;
1191
 
            break;
1192
 
-*/
1193
1187
        case REXC_FNEXTRACOMP :
1194
 
            *(uint32_t*)pData =          (uint32_t)REXCExtracomp;
 
1188
            *(intptr_t*)pData =          (intptr_t)REXCExtracomp;
1195
1189
            break;
1196
1190
        case REXC_FNEXTRA :
1197
 
            *(uint32_t*)pData =          (uint32_t)REXCExtra;
 
1191
            *(intptr_t*)pData =          (intptr_t)REXCExtra;
1198
1192
            break;
1199
1193
        case REXC_FNEXTRADIB:
1200
 
            *(uint32_t*)pData =          (uint32_t)REXCExtraDIB;
 
1194
            *(intptr_t*)pData =          (intptr_t)REXCExtraDIB;
1201
1195
            break;
1202
1196
 
1203
1197
        case    REXC_FNGETCONTAINER:
1204
 
            *(uint32_t*)pData =          (uint32_t)REXCGetContainer;
 
1198
            *(intptr_t*)pData =          (intptr_t)REXCGetContainer;
1205
1199
            break;
1206
1200
 
1207
1201
        case    REXC_FNGETLENEREP:
1208
 
            *(uint32_t*)pData =          (uint32_t)REXCMakeLP;
 
1202
            *(intptr_t*)pData =          (intptr_t)REXCMakeLP;
1209
1203
            break;
1210
1204
        case    REXC_FNVERSION:
1211
 
            *(uint32_t*)pData =          (uint32_t)REXC_VERSION_CODE;
1212
 
            break;
1213
 
/*-Andrey: moved to RRecCom (recognition) and RNorm (autorotate)
1214
 
//--------------------------------------------------------------
1215
 
        case    REXC_FNREX_ISLANGUAGE:
1216
 
            *(uint32_t*)pData =          (uint32_t)REXC_IsLanguage;
1217
 
            break;
1218
 
        case    REXC_FNGETORIENT:
1219
 
            *(uint32_t*)pData =          (uint32_t)REXC_GetOrient;
1220
 
            break;
1221
 
-*/
 
1205
            *(intptr_t*)pData =          (intptr_t)REXC_VERSION_CODE;
 
1206
            break;
1222
1207
        case    REXC_FNMN2CCOM:
1223
 
            *(uint32_t*)pData =          (uint32_t)REXC_MN2CCOM;
 
1208
            *(intptr_t*)pData =          (intptr_t)REXC_MN2CCOM;
1224
1209
            break;
1225
1210
        case    REXC_FNGETINVERTION:
1226
 
            *(uint32_t*)pData =          (uint32_t)REXC_GetInvertion;
1227
 
            break;
1228
 
/*-Andrey: moved to RRecCom (recognition) and RNorm (autorotate)
1229
 
//--------------------------------------------------------------
1230
 
        case    REXC_FNEVNALPHABET:     // установка алфавита для евент
1231
 
            *(uint32_t*)pData =          (uint32_t)REXC_SetEVNAlphabet;
1232
 
            break;
1233
 
-*/
 
1211
            *(intptr_t*)pData =          (intptr_t)REXC_GetInvertion;
 
1212
            break;
1234
1213
        case    REXC_FNEXTRACOMP3CB:    // 3 коллбэка
1235
 
            *(uint32_t*)pData =          (uint32_t)REXCExtracomp3CB;
1236
 
            break;
1237
 
/*-Andrey: moved to RRecCom (recognition) and RNorm (autorotate)
1238
 
//--------------------------------------------------------------
1239
 
        case    REXC_FNEXTGETRECRASTERORIENT: // ориентация рабочего растра
1240
 
            *(uint32_t*)pData =          (uint32_t)exc_get_rec_raster_orient;
1241
 
            break;
1242
 
        case    REXC_FNSETALLALPHAGRA: // алфавит нейронной сети
1243
 
            *(uint32_t*)pData =          (uint32_t)exc_set_all_alphabet_gra;
1244
 
            break;
1245
 
-*/
 
1214
            *(intptr_t*)pData =          (intptr_t)REXCExtracomp3CB;
 
1215
            break;
1246
1216
        default:
1247
1217
                wLowRC = REXC_ERR_NOTIMPLEMENT;
1248
1218
                rc = FALSE;
1844
1814
#endif
1845
1815
}
1846
1816
 
1847
 
static store_MN(MN *locmn,int16_t upper, int16_t left, int16_t w, int16_t h,
 
1817
static int store_MN(MN *locmn,int16_t upper, int16_t left, int16_t w, int16_t h,
1848
1818
                        int     scale_2)
1849
1819
{
1850
1820
if( !locmn )