go-tinyqr

commit

12c2b5949a92309965f82ae335b913ca5a8c13f0

parent

9434209cb0863a5f3c316b49a8abb7f7dc80610a

Author

vsenko <vsenko@gmail.com>

Date

2020-05-19 08:15

Export NewWithForcedVersion

Diffstat

2 files changed, 10 insertions, 3 deletions

diff --git a/qrcode.go b/qrcode.go

@@ -51,6 +51,7 @@ package qrcode
   51    51 import (
   52    52 	"bytes"
   53    53 	"errors"
   -1    54 	"fmt"
   54    55 	"image"
   55    56 	"image/color"
   56    57 	"image/png"
@@ -199,7 +200,13 @@ func New(content string, level RecoveryLevel) (*QRCode, error) {
  199   200 	return q, nil
  200   201 }
  201   202 
  202    -1 func newWithForcedVersion(content string, version int, level RecoveryLevel) (*QRCode, error) {
   -1   203 // NewWithForcedVersion constructs a QRCode of a specific version.
   -1   204 //
   -1   205 //	var q *qrcode.QRCode
   -1   206 //	q, err := qrcode.NewWithForcedVersion("my content", 25, qrcode.Medium)
   -1   207 //
   -1   208 // An error occurs in case of invalid version.
   -1   209 func NewWithForcedVersion(content string, version int, level RecoveryLevel) (*QRCode, error) {
  203   210 	var encoder *dataEncoder
  204   211 
  205   212 	switch {
@@ -210,7 +217,7 @@ func newWithForcedVersion(content string, version int, level RecoveryLevel) (*QR
  210   217 	case version >= 27 && version <= 40:
  211   218 		encoder = newDataEncoder(dataEncoderType27To40)
  212   219 	default:
  213    -1 		log.Fatalf("Invalid version %d (expected 1-40 inclusive)", version)
   -1   220 		return nil, fmt.Errorf("Invalid version %d (expected 1-40 inclusive)", version)
  214   221 	}
  215   222 
  216   223 	var encoded *bitset.Bitset

diff --git a/qrcode_decode_test.go b/qrcode_decode_test.go

@@ -93,7 +93,7 @@ func TestDecodeAllVersionLevels(t *testing.T) {
   93    93 				version,
   94    94 				level)
   95    95 
   96    -1 			q, err := newWithForcedVersion(
   -1    96 			q, err := NewWithForcedVersion(
   97    97 				fmt.Sprintf("v-%d l-%d", version, level), version, level)
   98    98 			if err != nil {
   99    99 				t.Fatal(err.Error())