From aa593fcd2df42e26e70b23aa73d0298db871fda9 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 1 Jul 2008 19:04:29 +0000
Subject: [PATCH] From Colin McDonald, "There is a problem reading bmp files
 containing a colour palette, due to an incorrect scan line length
 calculation.  Attached is a fix, and a little bmp file which demonstrates the
 problem."

---
 src/osgPlugins/bmp/ReaderWriterBMP.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osgPlugins/bmp/ReaderWriterBMP.cpp b/src/osgPlugins/bmp/ReaderWriterBMP.cpp
index 763b29444..3ab650d6c 100644
--- a/src/osgPlugins/bmp/ReaderWriterBMP.cpp
+++ b/src/osgPlugins/bmp/ReaderWriterBMP.cpp
@@ -263,7 +263,7 @@ int *numComponents_ret)
                 int npixperbyte=8/inf.Colorbits; // no of pixels per byte
                 for (int ii=0; ii<inf.width/npixperbyte; ii++) {
                     unsigned char mask=0x00; // masked with index to extract colorbits bits
-                    unsigned char byte=imptr[(j*inf.width/npixperbyte)+ii];
+                    unsigned char byte=imptr[(j*doff/npixperbyte)+ii];
                     int jj;
                     for (jj=0; jj<inf.Colorbits; jj++) mask |= (0x80>>jj); // fill N High end bits
                     for (jj=0; jj<npixperbyte; jj++) {