Merge branch 'feature/upstream' into develop

1 files changed, 3 insertions, 5 deletions

diff --git a/backend/pie.c b/backend/pie.c
index 0e56a5a..b5be0a2 100644
--- a/backend/pie.c
+++ b/backend/pie.c
@@ -17,9 +17,7 @@
    General Public License for more details.

 

    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,

-   MA 02111-1307, USA.

+   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 

    As a special exception, the authors of SANE give permission for

    additional uses of the libraries contained in this release of SANE.

@@ -60,7 +58,7 @@
  * 11-11-2000 eliminated some warnings about signed/unsigned comparisons

  *            removed #undef NDEBUG and C++ style comments

  *

- * 1-10-2000 force gamma table to one to one mappping if lineart or halftone selected

+ * 1-10-2000 force gamma table to one to one mapping if lineart or halftone selected

  *

  * 30-9-2000 added ADLIB devices to scanner_str[]

  *

@@ -1689,7 +1687,7 @@ pie_perform_cal (Pie_Scanner * scanner, int cal_index)
 

   send_length += 4;		/* space for header at start of data */

 

-  /* alllocate buffers for the receive data, the result buffers, and for the send data */

+  /* allocate buffers for the receive data, the result buffers, and for the send data */

   rcv_buffer = (unsigned char *) malloc (rcv_length);

 

   red_result = (long *) calloc (pixels_per_line, sizeof (long));