sync from upstream up to 22:14a375563e2b
This includes the following commits: changeset: 22:14a375563e2b summary: chang "while" command to "type -P" in bash based configure changeset: 21:c4bf7c0f33d2 summary: updated codec paper for RS01 life cycle changeset: 20:dbcaad8128aa summary: replaced build count with mercurial changeset changeset: 19:fba258a6acfa summary: Added tag 0.79.10 for changeset 49950be5a2ef changeset: 18:49950be5a2ef summary: merged some debian patches changeset: 17:815be3929c41 summary: merged "easy" patches from Stéphane Lesimple's version changeset: 16:7d15f8a958cb summary: Made printf format strings 32/64bit safe as suggested by Stéphane; changeset: 15:1055a53b8d6d summary: reorganized code for --with-gui=[yes|no] option changeset: 14:fbe2ae12a32c summary: Added tag 0.79.9 for changeset f2fdd6d3a1f5 changeset: 13:f2fdd6d3a1f5 summary: updated TODO and CHANGELOG And other changes that were needed to resolve the (many) conflicts.
This commit is contained in:
@@ -23,7 +23,6 @@
|
||||
#ifndef RS01INCLUDES_H
|
||||
#define RS01INCLUDES_H
|
||||
|
||||
#ifndef WITH_CLI_ONLY_YES
|
||||
/* Data structs from rs01-window.c */
|
||||
|
||||
typedef struct
|
||||
@@ -97,7 +96,6 @@ typedef struct
|
||||
int dataBytes;
|
||||
int percent, lastPercent;
|
||||
} RS01Widgets;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* local working closure for internal checksums
|
||||
@@ -107,7 +105,6 @@ typedef struct
|
||||
{ struct MD5Context md5ctxt; /* Complete image checksum */
|
||||
} RS01CksumClosure;
|
||||
|
||||
#ifndef WITH_CLI_ONLY_YES
|
||||
/*
|
||||
* These are exported via the Method struct
|
||||
*/
|
||||
@@ -123,7 +120,6 @@ void RS01ShowCurveButton(Method*);
|
||||
|
||||
void ResetRS01VerifyWindow(Method*);
|
||||
void CreateRS01VerifyWindow(Method*, GtkWidget*);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* These are exported (resp. only used) in ecc-rs01.c and rs01*.c
|
||||
@@ -159,13 +155,11 @@ void RS01Create(void);
|
||||
|
||||
void RS01Fix(Image*);
|
||||
|
||||
#ifndef WITH_CLI_ONLY_YES
|
||||
/* rs01-window.c */
|
||||
|
||||
void RS01AddFixValues(RS01Widgets*, int, int);
|
||||
void RS01SetFixMaxValues(RS01Widgets*, int, int, gint64);
|
||||
void RS01UpdateFixResults(RS01Widgets*, gint64, gint64);
|
||||
#endif
|
||||
|
||||
/* rs01-verify.c */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user