Skip to content

Commit

Permalink
passing tests (though more needed)
Browse files Browse the repository at this point in the history
  • Loading branch information
@suyashkumar
suyashkumar committed May 27, 2024
1 parent 77468eb commit a69d754
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 42 deletions.
4 changes: 2 additions & 2 deletions pkg/frame/native_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ func TestNativeFrame_GetImage(t *testing.T) {

// Check that all pixels are zero except at the
// (ExpectedSetPointX, ExpectedSetPointY) point.
for x := 0; x < tc.NativeFrame.Cols; x++ {
for y := 0; y < tc.NativeFrame.Rows; y++ {
for x := 0; x < tc.NativeFrame.Cols(); x++ {
for y := 0; y < tc.NativeFrame.Rows(); y++ {
currValue := imgGray.Gray16At(x, y).Y
if within(point{x, y}, tc.SetPoints) {
if currValue != 1 {
Expand Down
5 changes: 5 additions & 0 deletions read.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,13 @@ func (r *reader) readNativeFrames(parsedData *Dataset, fc chan<- *frame.Frame, v
currentFrame, _, err = readNativeFrame[uint16](bitsAllocated, MustGetInts(rows.Value)[0], MustGetInts(cols.Value)[0], bytesToRead, samplesPerPixel, pixelsPerFrame, pixelBuf, r.rawReader)
case 32:
currentFrame, _, err = readNativeFrame[uint32](bitsAllocated, MustGetInts(rows.Value)[0], MustGetInts(cols.Value)[0], bytesToRead, samplesPerPixel, pixelsPerFrame, pixelBuf, r.rawReader)
default:
return nil, bytesToRead, fmt.Errorf("unsupported bitsAllocated, got: %v, %w", bitsAllocated, ErrorUnsupportedBitsAllocated)
}
}
if err != nil {
return nil, bytesToRead, err
}
image.Frames[frameIdx] = &currentFrame
if fc != nil {
fc <- &currentFrame // write the current frame to the frame channel
Expand Down
48 changes: 24 additions & 24 deletions read_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,11 @@ func TestReadNativeFrames(t *testing.T) {
Frames: []*frame.Frame{
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint16]{
InternalBitsPerSample: 16,
InternalRows: 5,
InternalCols: 5,
Data: [][]int{{1}, {2}, {3}, {4}, {5}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}},
Data: [][]uint16{{1}, {2}, {3}, {4}, {5}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}},
},
},
},
Expand All @@ -258,29 +258,29 @@ func TestReadNativeFrames(t *testing.T) {
Frames: []*frame.Frame{
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint16]{
InternalBitsPerSample: 16,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{1}, {2}, {3}, {2}},
Data: [][]uint16{{1}, {2}, {3}, {2}},
},
},
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint16]{
InternalBitsPerSample: 16,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{1}, {2}, {3}, {2}},
Data: [][]uint16{{1}, {2}, {3}, {2}},
},
},
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint16]{
InternalBitsPerSample: 16,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{1}, {2}, {3}, {0}},
Data: [][]uint16{{1}, {2}, {3}, {0}},
},
},
},
Expand All @@ -302,20 +302,20 @@ func TestReadNativeFrames(t *testing.T) {
Frames: []*frame.Frame{
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint16]{
InternalBitsPerSample: 16,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{1, 2}, {3, 2}, {1, 2}, {3, 2}},
Data: [][]uint16{{1, 2}, {3, 2}, {1, 2}, {3, 2}},
},
},
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint16]{
InternalBitsPerSample: 16,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{1, 2}, {3, 2}, {1, 2}, {3, 5}},
Data: [][]uint16{{1, 2}, {3, 2}, {1, 2}, {3, 5}},
},
},
},
Expand Down Expand Up @@ -411,30 +411,30 @@ func TestReadNativeFrames(t *testing.T) {
Frames: []*frame.Frame{
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint8]{
InternalBitsPerSample: 8,
InternalRows: 3,
InternalCols: 3,
Data: [][]int{{11}, {12}, {13}, {21}, {22}, {23}, {31}, {32}, {33}},
Data: [][]uint8{{11}, {12}, {13}, {21}, {22}, {23}, {31}, {32}, {33}},
},
},

{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint8]{
InternalBitsPerSample: 8,
InternalRows: 3,
InternalCols: 3,
Data: [][]int{{11}, {12}, {13}, {21}, {22}, {23}, {31}, {32}, {33}},
Data: [][]uint8{{11}, {12}, {13}, {21}, {22}, {23}, {31}, {32}, {33}},
},
},
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint8]{
InternalBitsPerSample: 8,
InternalRows: 3,
InternalCols: 3,
Data: [][]int{{11}, {12}, {13}, {21}, {22}, {23}, {31}, {32}, {33}},
Data: [][]uint8{{11}, {12}, {13}, {21}, {22}, {23}, {31}, {32}, {33}},
},
},
},
Expand All @@ -456,29 +456,29 @@ func TestReadNativeFrames(t *testing.T) {
Frames: []*frame.Frame{
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint8]{
InternalBitsPerSample: 8,
InternalRows: 1,
InternalCols: 1,
Data: [][]int{{1, 2, 3}},
Data: [][]uint8{{1, 2, 3}},
},
},
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint8]{
InternalBitsPerSample: 8,
InternalRows: 1,
InternalCols: 1,
Data: [][]int{{1, 2, 3}},
Data: [][]uint8{{1, 2, 3}},
},
},
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint8]{
InternalBitsPerSample: 8,
InternalRows: 1,
InternalCols: 1,
Data: [][]int{{1, 2, 3}},
Data: [][]uint8{{1, 2, 3}},
},
},
},
Expand Down
32 changes: 16 additions & 16 deletions write_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,11 @@ func TestWrite(t *testing.T) {
Frames: []*frame.Frame{
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint8]{
InternalBitsPerSample: 8,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{1}, {2}, {3}, {4}},
Data: [][]uint8{{1}, {2}, {3}, {4}},
},
},
},
Expand All @@ -319,11 +319,11 @@ func TestWrite(t *testing.T) {
Frames: []*frame.Frame{
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint16]{
InternalBitsPerSample: 16,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{1}, {2}, {3}, {4}},
Data: [][]uint16{{1}, {2}, {3}, {4}},
},
},
},
Expand All @@ -347,11 +347,11 @@ func TestWrite(t *testing.T) {
Frames: []*frame.Frame{
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint32]{
InternalBitsPerSample: 32,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{1}, {2}, {3}, {4}},
Data: [][]uint32{{1}, {2}, {3}, {4}},
},
},
},
Expand All @@ -375,20 +375,20 @@ func TestWrite(t *testing.T) {
Frames: []*frame.Frame{
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint32]{
InternalBitsPerSample: 32,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{1, 1}, {2, 2}, {3, 3}, {4, 4}},
Data: [][]uint32{{1, 1}, {2, 2}, {3, 3}, {4, 4}},
},
},
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint32]{
InternalBitsPerSample: 32,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{5, 1}, {2, 2}, {3, 3}, {4, 5}},
Data: [][]uint32{{5, 1}, {2, 2}, {3, 3}, {4, 5}},
},
},
},
Expand Down Expand Up @@ -458,20 +458,20 @@ func TestWrite(t *testing.T) {
Frames: []*frame.Frame{
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint32]{
InternalBitsPerSample: 32,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{1, 1}, {2, 2}, {3, 3}, {4, 4}},
Data: [][]uint32{{1, 1}, {2, 2}, {3, 3}, {4, 4}},
},
},
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint32]{
InternalBitsPerSample: 32,
InternalRows: 2,
InternalCols: 2,
Data: [][]int{{5, 1}, {2, 2}, {3, 3}, {4, 5}},
Data: [][]uint32{{5, 1}, {2, 2}, {3, 3}, {4, 5}},
},
},
},
Expand All @@ -495,11 +495,11 @@ func TestWrite(t *testing.T) {
Frames: []*frame.Frame{
{
Encapsulated: false,
NativeData: &frame.NativeFrame[int]{
NativeData: &frame.NativeFrame[uint8]{
InternalBitsPerSample: 8,
InternalRows: 1,
InternalCols: 3,
Data: [][]int{{1}, {2}, {3}},
Data: [][]uint8{{1}, {2}, {3}},
},
},
},
Expand Down

0 comments on commit a69d754

Please sign in to comment.