diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 04766b207afba7961d4d802313e426f5a2fbef63 (patch) | |
| tree | c888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /filters/chalk/raw | |
| parent | b6edfe41c9395f2e20784cbf0e630af6426950a3 (diff) | |
| download | koffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'filters/chalk/raw')
| -rw-r--r-- | filters/chalk/raw/dcraw.c | 10 | ||||
| -rw-r--r-- | filters/chalk/raw/kis_raw_import.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/filters/chalk/raw/dcraw.c b/filters/chalk/raw/dcraw.c index e92c1d3c..b892a5ca 100644 --- a/filters/chalk/raw/dcraw.c +++ b/filters/chalk/raw/dcraw.c @@ -1146,12 +1146,12 @@ void CLASS rollei_load_raw() void CLASS phase_one_load_raw() { int row, col, a, b; - ushort *pixel, akey, bkey, tqmask; + ushort *pixel, akey, bkey, mask; fseek (ifp, nikon_curve_offset, SEEK_SET); akey = get2(); bkey = get2(); - tqmask = tiff_data_compression == 1 ? 0x5555:0x1354; + mask = tiff_data_compression == 1 ? 0x5555:0x1354; fseek (ifp, data_offset + top_margin*raw_width*2, SEEK_SET); pixel = calloc (raw_width, sizeof *pixel); merror (pixel, "phase_one_load_raw()"); @@ -1160,8 +1160,8 @@ void CLASS phase_one_load_raw() for (col=0; col < raw_width; col+=2) { a = pixel[col+0] ^ akey; b = pixel[col+1] ^ bkey; - pixel[col+0] = (a & tqmask) | (b & ~tqmask); - pixel[col+1] = (b & tqmask) | (a & ~tqmask); + pixel[col+0] = (a & mask) | (b & ~mask); + pixel[col+1] = (b & mask) | (a & ~mask); } for (col=0; col < width; col++) BAYER(row,col) = pixel[col+left_margin]; @@ -5731,7 +5731,7 @@ void CLASS write_psd (FILE *ofp) 0,3, /* mode (1=grey, 3=rgb) */ 0,0,0,0, /* color mode data */ 0,0,0,0, /* image resources */ - 0,0,0,0, /* layer/tqmask info */ + 0,0,0,0, /* layer/mask info */ 0,0 /* no compression */ }; int hw[2], psize, row, col, c; diff --git a/filters/chalk/raw/kis_raw_import.h b/filters/chalk/raw/kis_raw_import.h index 35adb6e1..17fd576c 100644 --- a/filters/chalk/raw/kis_raw_import.h +++ b/filters/chalk/raw/kis_raw_import.h @@ -33,7 +33,7 @@ class KisRawImport : public KoFilter { TQ_OBJECT public: - KisRawImport(KoFilter *tqparent, const char *name, const TQStringList&); + KisRawImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KisRawImport(); public: |