Skip to content

Adds support for RLE compression to BMPs #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2019

Conversation

fionawhim
Copy link
Contributor

Fixes #20

RLE compression is allowed on 4-bit and 8-bit BMP images. This commit adds
handling for compression levels 1 and 2.

It adds 2 tiny test files for the 4-bit and 8-bit depths, since the
algorithm differs slightly between them. It also includes a version
of the color_wheel.bmp encoded with 8-bit RLE. I cut the image in half
horizontally so that it would load on the PyGamer, which couldn't
allocate the full Bitmap (presumably due to heap fragmentation).

@fionawhim
Copy link
Contributor Author

The code is working AFAICT. The build failure is in the linting stuff which I don’t know how to address.

@ladyada
Copy link
Member

ladyada commented Aug 17, 2019

@PaintYourDragon taggin you as an FYI if we want to support RLE in bmpdraw

@ladyada
Copy link
Member

ladyada commented Aug 17, 2019

hiya yep pylint is a little sad
https://travis-ci.com/adafruit/Adafruit_CircuitPython_ImageLoad/builds/123582501#L548
but these are not too bad:
remove trailing whitespace with your editor
for line too long, you can split the line into two
for the other complatints, you could try to refactor your code to have a helper function OR you can disable pylint complatins on those lines if its not worthwhile refactoring

@fionawhim
Copy link
Contributor Author

Awesome. I should be able to sort that out very soon.

Fixes adafruit#20

RLE compression is allowed on 4-bit and 8-bit BMP images. This commit adds
handling for compression levels 1 and 2.

It adds 2 tiny test files for the 4-bit and 8-bit depths, since the
algorithm differs slightly between them. It also includes a version
of the color_wheel.bmp encoded with 8-bit RLE. I cut the image in half
horizontally so that it would load on the PyGamer, which couldn't
allocate the full Bitmap (presumably due to heap fragmentation).
@fionawhim
Copy link
Contributor Author

OK, build passing now!

Copy link
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Thank you so much @fionawhim

@tannewt tannewt merged commit 814bda6 into adafruit:master Aug 22, 2019
@ladyada
Copy link
Member

ladyada commented Sep 16, 2019

yay pardon for the delay - this is now released on pypi!

adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Sep 17, 2019
Updating https://github.com/adafruit/Adafruit_CircuitPython_ADXL34x to 1.10.3 from 1.10.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_ADXL34x#9 from hartzell/patch-2

Updating https://github.com/adafruit/Adafruit_CircuitPython_BME280 to 2.3.2 from 2.3.1:
  > Merge pull request adafruit/Adafruit_CircuitPython_BME280#27 from ncguk/patch-1

Updating https://github.com/adafruit/Adafruit_CircuitPython_CircuitPlayground to 2.1.4 from 2.1.3:
  > Merge pull request adafruit/Adafruit_CircuitPython_CircuitPlayground#69 from caternuson/iss68

Updating https://github.com/adafruit/Adafruit_CircuitPython_DS18X20 to 1.2.0 from 1.1.3:
  > Merge pull request adafruit/Adafruit_CircuitPython_DS18X20#12 from LBertrandDC/asynchronous-functions

Updating https://github.com/adafruit/Adafruit_CircuitPython_DS2413 to 1.1.3 from 1.1.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_DS2413#9 from dherrada/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_GPS to 3.4.0 from 3.3.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_GPS#34 from dherrada/master
  > Merge pull request adafruit/Adafruit_CircuitPython_GPS#31 from dherrada/master
  > Merge branch 'master' into master

Updating https://github.com/adafruit/Adafruit_CircuitPython_HTU21D to 0.9.0 from 0.8.1:
  > Merge pull request adafruit/Adafruit_CircuitPython_HTU21D#5 from dherrada/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_IRRemote to 3.4.0 from 3.3.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_IRRemote#27 from tannewt/remove_debug
  > Merge pull request adafruit/Adafruit_CircuitPython_IRRemote#25 from makermelissa/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_MCP3xxx to 1.1.0 from 1.0.3:
  > Merge pull request adafruit/Adafruit_CircuitPython_MCP3xxx#14 from brentru/update-examples

Updating https://github.com/adafruit/Adafruit_CircuitPython_MPR121 to 2.0.4 from 2.0.3:
  > Merge pull request adafruit/Adafruit_CircuitPython_MPR121#20 from ntoll/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_MPRLS to 1.1.0 from 1.0.3:
  > Merge pull request adafruit/Adafruit_CircuitPython_MPRLS#6 from romanakozak/patch-1

Updating https://github.com/adafruit/Adafruit_CircuitPython_MSA301 to 1.1.0 from 1.0.0:
  > added tap detection. Couldn't make latching work

Updating https://github.com/adafruit/Adafruit_CircuitPython_Nunchuk to 0.1.1 from 0.1.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_Nunchuk#5 from ntoll/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_PCT2075 to 1.0.1 from 1.0.0:
  > fixed typos for (yet to be used) fault queue length

Updating https://github.com/adafruit/Adafruit_CircuitPython_SHT31D to 2.1.0 from 2.0.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_SHT31D#11 from WoefulDerelict/periodic_data_acquisition
  > Merge pull request adafruit/Adafruit_CircuitPython_SHT31D#10 from WoefulDerelict/temperature_docstring_fix

Updating https://github.com/adafruit/Adafruit_CircuitPython_SSD1306 to 2.6.4 from 2.6.3:
  > Merge pull request adafruit/Adafruit_CircuitPython_SSD1306#29 from adafruit/tannewt-patch-1

Updating https://github.com/adafruit/Adafruit_CircuitPython_Thermal_Printer to 1.1.3 from 1.1.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_Thermal_Printer#10 from caternuson/README_update

Updating https://github.com/adafruit/Adafruit_CircuitPython_TLC59711 to 1.1.3 from 1.1.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_TLC59711#6 from demophoon/add-blinka-to-requirements-txt

Updating https://github.com/adafruit/Adafruit_CircuitPython_AVRprog to 1.2.0 from 1.1.3:
  > Merge pull request adafruit/Adafruit_CircuitPython_AVRprog#10 from aaronaverill/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_FancyLED to 1.3.1 from 1.3.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_FancyLED#8 from schlafa/patch-1

Updating https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad to 0.9.2 from 0.9.1:
  > Merge pull request adafruit/Adafruit_CircuitPython_ImageLoad#21 from fionawhim/rle-bmp
  > Merge pull request adafruit/Adafruit_CircuitPython_ImageLoad#19 from cogliano/patch-2
  > Merge pull request adafruit/Adafruit_CircuitPython_ImageLoad#18 from cogliano/patch-1
  > Merge pull request adafruit/Adafruit_CircuitPython_ImageLoad#17 from deshipu/master
  > Merge pull request adafruit/Adafruit_CircuitPython_ImageLoad#15 from tannewt/fix_one_bit

Updating https://github.com/adafruit/Adafruit_CircuitPython_miniesptool to 0.1.5 from 0.1.4:
  > Merge pull request adafruit/Adafruit_CircuitPython_miniesptool#11 from dherrada/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_MotorKit to 1.3.1 from 1.3.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_MotorKit#20 from adario7/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_Requests to 1.1.3 from 1.1.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_Requests#11 from jerryneedell/jerryn_bytes

Updating https://github.com/adafruit/Adafruit_CircuitPython_RTTTL to 2.3.0 from 2.2.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_RTTTL#14 from hexthat/patch-1

Updating https://github.com/adafruit/Adafruit_CircuitPython_SimpleIO to 2.0.0 from 1.2.1:
  > Merge pull request adafruit/Adafruit_CircuitPython_SimpleIO#46 from jepler/issue45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BMP RLE error or support?
3 participants