--------------Boundary-00=_2F8OAWZDXCWCPPB3DF8Z Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Subject:
mh, Samstag, 25. Mai 2002 12:10: > > If this really is a xsane problem please tell me how I can reproduce this > > with e.g. the pnm backend. > > You are right, there are no problems with the pnm backend. Seems like I > have to look at the backend again. Hi again, after I could not find a bug in my backend, I dared to take a look at xsane. I'm quite sure now, that there's indeed a bug in xsane. Please take a look at the attached patch for xsane_scan.c. I've tested this with the tevion, pnm and the test backend -> no problems. Michael --------------Boundary-00=_2F8OAWZDXCWCPPB3DF8Z Content-Type: text/x-diff; charset="iso-8859-1"; name="xsane-scan.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="xsane-scan.diff" LS0tIHhzYW5lLXNjYW4uYwlUdWUgTWFyIDI2IDE4OjI3OjQ2IDIwMDIKKysrIHhzYW5lLXNjYW4t bWguYwlTYXQgTWF5IDI1IDE2OjIzOjE1IDIwMDIKQEAgLTExNywxMiArMTE3LDE2IEBACiAgU0FO RV9JbnQgbGVuOwogIGludCBpLCBqLCB4OwogIGNoYXIgYnVmWzI1NV07CisgaW50IGxpbmVhcnRf Y250OwogCiAgIERCRyhEQkdfcHJvYywgInhzYW5lX3JlYWRfaW1hZ2VfZGF0YVxuIik7CiAKICAg eHNhbmUucmVhZGluZ19kYXRhID0gVFJVRTsKIAogICB4ID0geHNhbmUucGFyYW0ucGl4ZWxzX3Bl cl9saW5lOworICAvKmNvdW50cyB0aGUgbnVtYmVyIG9mIGJ5dGVzIHRoYXQgaGF2ZSB0byBiZSB3 cml0dGVuLCBpZiB0aGUKKyAgICBpbWFnZSBpcyBjb252ZXJ0ZWQgZnJvbSAxYml0IHRvIDhiaXQg Ki8KKyAgbGluZWFydF9jbnQgPSAwOwogCiAgIGlmICggKHhzYW5lLnBhcmFtLmRlcHRoID09IDEp IHx8ICh4c2FuZS5wYXJhbS5kZXB0aCA9PSA4KSApCiAgIHsKQEAgLTIxOCwxNiArMjIyLDE2IEBA CiAKICAgICAgICAgICAgICAgZndyaXRlKGJ1ZjgsIDEsIGxlbiwgeHNhbmUub3V0KTsgLyogd3Jp dGUgZ2FtbWEgY29ycmVjdGVkIGRhdGEgKi8KICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGVs c2UgaWYgKCh4c2FuZS5wYXJhbS5kZXB0aCA9PSAxKSAmJiAoeHNhbmUuZXhwYW5kX2xpbmVhcnRf dG9fZ3JheXNjYWxlKSkgCisgICAgICAgICAgICBlbHNlIGlmICgoeHNhbmUucGFyYW0uZGVwdGgg PT0gMSkgJiYgKHhzYW5lLmV4cGFuZF9saW5lYXJ0X3RvX2dyYXlzY2FsZSkpCiAgICAgICAgICAg ICB7CiAgICAgICAgICAgICAgdW5zaWduZWQgY2hhciAqZXhwYW5kZWRfYnVmODsKICAgICAgICAg ICAgICB1bnNpZ25lZCBjaGFyICpleHBhbmRlZF9idWY4cHRyOwotIAorCiAgICAgICAgICAgICAg IC8qIGlmIHdlIHdhbnQgdG8gZG8gYW55IHBvc3Rwcm9jZXNzaW5nIChlLmcuIHJvdGF0aW9uKSAq LwogICAgICAgICAgICAgICAvKiB3ZSBzYXZlIGxpbmVhcnQgaW1hZ2VzIGluIGdyYXlzY2FsZSBt b2RlICovCiAgICAgICAgICAgICAgIC8qIHRvIHNwZWVkIHVwIHRyYW5zZm9ybWF0aW9uIGFuZCBz YXZpbmcgdGhlIHRyYW5zZm9ybWVkICBleHBhbmRlZCAoMWJpdC0+MWJ5dGUpICovCiAgICAgICAg ICAgICAgIC8qIGlzIHdyaXR0ZW4gaW4gYSBidWZmZXIgYW5kIHNhdmVkIGFzIGZ1bGwgYnVmZmVy ICovCi0gCisKICAgICAgICAgICAgICAgZXhwYW5kZWRfYnVmOCA9IG1hbGxvYyhsZW4gKiA4KTsg Lyogb25lIGJ5dGUgZm9yIGVhY2ggcGl4ZWwgKGJpdCkgKi8KICAgICAgICAgICAgICAgaWYgKCFl eHBhbmRlZF9idWY4KQogICAgICAgICAgICAgICB7CkBAIC0yMzYsMTAgKzI0MCwxMCBAQAogICAg ICAgICAgICAgICAgIHhzYW5lX2JhY2tfZ3RrX2Vycm9yKGJ1ZiwgVFJVRSk7CiAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgICAgICAgIH0KLSAKKwogICAgICAgICAgICAgICBleHBhbmRl ZF9idWY4cHRyID0gZXhwYW5kZWRfYnVmODsKICAgICAgICAgICAgICAgYnVmOHB0ciA9IGJ1Zjg7 Ci0gCisKICAgICAgICAgICAgICAgZm9yIChpID0gMDsgaSA8IGxlbjsgKytpKQogICAgICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgdmFsID0gKmJ1ZjhwdHI7CkBAIC0yNDgsNiArMjUyLDcg QEAKICAgICAgICAgICAgICAgICAgICpleHBhbmRlZF9idWY4cHRyID0gKHZhbCAmICgxIDw8IGop KSA/IDB4MDAgOiAweGZmOwogICAgICAgICAgICAgICAgICAgZXhwYW5kZWRfYnVmOHB0cisrOwog ICAgICAgICAgICAgICAgICAgeC0tOworICAgICAgICAgICAgICAgICAgKytsaW5lYXJ0X2NudDsK ICAgICAgICAgICAgICAgICAgIGlmICh4IDw9IDApCiAgICAgICAgICAgICAgICAgICB7CiAgICAg ICAgICAgICAgICAgICAgIHggPSB4c2FuZS5wYXJhbS5waXhlbHNfcGVyX2xpbmU7CkBAIC0yNTYs NyArMjYxLDggQEAKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgYnVmOHB0cisr OwogICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgIGZ3cml0ZShleHBhbmRlZF9idWY4LCAx LCBsZW4qOCwgeHNhbmUub3V0KTsKKyAgICAgICAgICAgICAgLyp0aGUgbnVtYmVyIG9mIGJ5dGVz IHdlIGhhdmUgdG8gd3JpdGUgbWF5IGJlIGRpZmZlcmVudCBmcm9tIGxlbio4ICovCisgICAgICAg ICAgICAgIGZ3cml0ZShleHBhbmRlZF9idWY4LCAxLGxpbmVhcnRfY250LHhzYW5lLm91dCk7CiAg ICAgICAgICAgICAgIGZyZWUoZXhwYW5kZWRfYnVmOCk7CiAgICAgICAgICAgICB9CiAgICAgICAg ICAgICBlbHNlIC8qIHNhdmUgZGlyZWN0IHRvIHRoZSBmaWxlICovCg== --------------Boundary-00=_2F8OAWZDXCWCPPB3DF8Z--
